Snap for 5949240 from 352d08cf21522416f2d56d7efc4603639844190a to sdk-release

Change-Id: I61bcf5760fdb0041d39e26961d0fddca2e85c5ce
diff --git a/compatdx-master.jar b/compatdx-master.jar
index e886529..3f6c8a2 100644
--- a/compatdx-master.jar
+++ b/compatdx-master.jar
Binary files differ
diff --git a/compatdx-master.jar.map b/compatdx-master.jar.map
index fb86228..9b73355 100644
--- a/compatdx-master.jar.map
+++ b/compatdx-master.jar.map
@@ -1,7 +1,7 @@
 # compiler: R8
-# compiler_version: 1.7.7-dev
+# compiler_version: 1.7.12-dev
 # compiler_hash: engineering
-# pg_map_id: 7be1a14
+# pg_map_id: b988d72
 # common_typos_disable
 com.android.tools.r8.ApiLevelException -> com.android.tools.r8.a:
     boolean $assertionsDisabled -> c
@@ -173,19 +173,19 @@
     com.android.tools.r8.StringConsumer mainDexListConsumer -> g
     com.android.tools.r8.ProgramConsumer programConsumer -> f
     com.android.tools.r8.CompilationMode mode -> e
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:10:void <init>(boolean,boolean):44:53 -> <init>
-    11:22:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean,java.util.function.BiPredicate):67:78 -> <init>
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:10:void <init>(boolean,boolean):43:52 -> <init>
+    11:22:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean,java.util.function.BiPredicate):66:77 -> <init>
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:1:com.android.tools.r8.utils.Reporter getReporter():134:134 -> b
-    1:1:java.util.function.BiPredicate getDexClassChecksumFilter():122:122 -> getDexClassChecksumFilter
-    1:1:boolean getEnableDesugaring():112:112 -> getEnableDesugaring
-    1:1:boolean getIncludeClassesChecksum():117:117 -> getIncludeClassesChecksum
-    1:1:com.android.tools.r8.StringConsumer getMainDexListConsumer():107:107 -> getMainDexListConsumer
-    1:1:int getMinApiLevel():91:91 -> getMinApiLevel
-    1:1:com.android.tools.r8.CompilationMode getMode():86:86 -> getMode
-    1:1:com.android.tools.r8.ProgramConsumer getProgramConsumer():100:100 -> getProgramConsumer
-    1:1:boolean isOptimizeMultidexForLinearAlloc():130:130 -> isOptimizeMultidexForLinearAlloc
+    1:1:com.android.tools.r8.utils.Reporter getReporter():133:133 -> b
+    1:1:java.util.function.BiPredicate getDexClassChecksumFilter():121:121 -> getDexClassChecksumFilter
+    1:1:boolean getEnableDesugaring():111:111 -> getEnableDesugaring
+    1:1:boolean getIncludeClassesChecksum():116:116 -> getIncludeClassesChecksum
+    1:1:com.android.tools.r8.StringConsumer getMainDexListConsumer():106:106 -> getMainDexListConsumer
+    1:1:int getMinApiLevel():90:90 -> getMinApiLevel
+    1:1:com.android.tools.r8.CompilationMode getMode():85:85 -> getMode
+    1:1:com.android.tools.r8.ProgramConsumer getProgramConsumer():99:99 -> getProgramConsumer
+    1:1:boolean isOptimizeMultidexForLinearAlloc():129:129 -> isOptimizeMultidexForLinearAlloc
 com.android.tools.r8.BaseCompilerCommand$Builder -> com.android.tools.r8.BaseCompilerCommand$Builder:
     boolean includeClassesChecksum -> n
     java.util.function.BiPredicate dexClassChecksumFilter -> p
@@ -199,58 +199,60 @@
     com.android.tools.r8.OutputMode outputMode -> i
     boolean $assertionsDisabled -> q
     java.util.List desugaredLibraryConfigurationResources -> m
-    1:1:void <clinit>():144:144 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler):170:170 -> <init>
-    2:25:void <init>(com.android.tools.r8.DiagnosticsHandler):148:171 -> <init>
+    1:1:void <clinit>():143:143 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler):169:169 -> <init>
+    2:25:void <init>(com.android.tools.r8.DiagnosticsHandler):147:170 -> <init>
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:33:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):349:381 -> a
-    34:45:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):451:462 -> a
-    46:46:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):455:455 -> a
+    1:33:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):348:380 -> a
+    34:45:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):450:461 -> a
+    46:46:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):454:454 -> a
     47:47:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    47:47:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):455 -> a
+    47:47:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):454 -> a
     48:48:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     48:48:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    48:48:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):455 -> a
-    49:49:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):455:455 -> a
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):438:439 -> addDesugaredLibraryConfiguration
-    3:5:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):438:440 -> addDesugaredLibraryConfiguration
-    6:7:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(com.android.tools.r8.StringResource):445:446 -> addDesugaredLibraryConfiguration
-    1:1:com.android.tools.r8.BaseCompilerCommand$Builder addSpecialLibraryConfiguration(java.lang.String):432:432 -> addSpecialLibraryConfiguration
-    1:32:void validate():482:513 -> e
+    48:48:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):454 -> a
+    49:49:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):454:454 -> a
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):437:438 -> addDesugaredLibraryConfiguration
+    3:3:com.android.tools.r8.StringResource com.android.tools.r8.StringResource.fromString(java.lang.String,com.android.tools.r8.origin.Origin):26:26 -> addDesugaredLibraryConfiguration
+    3:3:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):438 -> addDesugaredLibraryConfiguration
+    4:6:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):437:439 -> addDesugaredLibraryConfiguration
+    7:8:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(com.android.tools.r8.StringResource):444:445 -> addDesugaredLibraryConfiguration
+    1:1:com.android.tools.r8.BaseCompilerCommand$Builder addSpecialLibraryConfiguration(java.lang.String):431:431 -> addSpecialLibraryConfiguration
+    1:29:void validate():481:509 -> e
     com.android.tools.r8.CompilationMode defaultCompilationMode() -> f
-    1:1:boolean hasDesugaredLibraryConfiguration():466:466 -> 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:boolean hasDesugaredLibraryConfiguration():465:465 -> g
+    1:1:java.util.function.BiPredicate getDexClassChecksumFilter():243:243 -> getDexClassChecksumFilter
+    1:1:boolean getDisableDesugaring():426:426 -> getDisableDesugaring
+    1:1:boolean getIncludeClassesChecksum():476:476 -> getIncludeClassesChecksum
+    1:1:com.android.tools.r8.StringConsumer getMainDexListConsumer():236:236 -> getMainDexListConsumer
+    1:1:boolean isMinApiLevelSet():389:389 -> getMinApiLevel
+    1:1:int getMinApiLevel():385 -> getMinApiLevel
+    2:2:int getMinApiLevel():385:385 -> 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
-    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 isMinApiLevelSet():390:390 -> h
-    1:1:boolean isOptimizeMultidexForLinearAlloc():262:262 -> i
-    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
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setIncludeClassesChecksum(boolean):471:472 -> setIncludeClassesChecksum
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setMainDexListConsumer(com.android.tools.r8.StringConsumer):305:306 -> setMainDexListConsumer
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setMainDexListOutputPath(java.nio.file.Path):292:293 -> setMainDexListOutputPath
-    1:5:com.android.tools.r8.BaseCompilerCommand$Builder setMinApiLevel(int):396:400 -> setMinApiLevel
-    1:3:com.android.tools.r8.BaseCompilerCommand$Builder setMode(com.android.tools.r8.CompilationMode):197:199 -> setMode
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setOptimizeMultidexForLinearAlloc(boolean):253:254 -> setOptimizeMultidexForLinearAlloc
-    1:1:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):320:320 -> setOutput
-    2:7:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):325:330 -> setOutput
-    1:4:com.android.tools.r8.BaseCompilerCommand$Builder setProgramConsumer(com.android.tools.r8.ProgramConsumer):276:279 -> setProgramConsumer
+    3:3:int getMinApiLevel():385 -> getMinApiLevel
+    4:4:int getMinApiLevel():385:385 -> getMinApiLevel
+    1:1:com.android.tools.r8.CompilationMode getMode():189:189 -> getMode
+    1:1:com.android.tools.r8.OutputMode getOutputMode():218:218 -> getOutputMode
+    1:1:java.nio.file.Path getOutputPath():208:208 -> getOutputPath
+    1:1:com.android.tools.r8.ProgramConsumer getProgramConsumer():229:229 -> getProgramConsumer
+    1:1:boolean isMinApiLevelSet():389:389 -> h
+    1:1:boolean isOptimizeMultidexForLinearAlloc():261:261 -> i
+    1:3:com.android.tools.r8.BaseCompilerCommand$Builder setDexClassChecksumFilter(java.util.function.BiPredicate):339:341 -> setDexClassChecksumFilter
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setDisableDesugaring(boolean):420:421 -> setDisableDesugaring
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setEnableDesugaring(boolean):404:405 -> setEnableDesugaring
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setIncludeClassesChecksum(boolean):470:471 -> setIncludeClassesChecksum
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setMainDexListConsumer(com.android.tools.r8.StringConsumer):304:305 -> setMainDexListConsumer
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setMainDexListOutputPath(java.nio.file.Path):291:292 -> setMainDexListOutputPath
+    1:5:com.android.tools.r8.BaseCompilerCommand$Builder setMinApiLevel(int):395:399 -> setMinApiLevel
+    1:3:com.android.tools.r8.BaseCompilerCommand$Builder setMode(com.android.tools.r8.CompilationMode):196:198 -> setMode
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setOptimizeMultidexForLinearAlloc(boolean):252:253 -> setOptimizeMultidexForLinearAlloc
+    1:1:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):319:319 -> setOutput
+    2:7:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):324:329 -> setOutput
+    1:4:com.android.tools.r8.BaseCompilerCommand$Builder setProgramConsumer(com.android.tools.r8.ProgramConsumer):275:278 -> setProgramConsumer
 com.android.tools.r8.BaseCompilerCommand$Builder$1 -> com.android.tools.r8.BaseCompilerCommand$Builder$a:
-    1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):356:356 -> <init>
+    1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):355:355 -> <init>
 com.android.tools.r8.BaseCompilerCommand$Builder$2 -> com.android.tools.r8.BaseCompilerCommand$Builder$b:
-    1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):363:363 -> <init>
+    1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):362:362 -> <init>
 com.android.tools.r8.BaseCompilerCommandParser -> com.android.tools.r8.b:
     1:1:void <init>():9:9 -> <init>
     1:10:void parseMinApi(com.android.tools.r8.BaseCompilerCommand$Builder,java.lang.String,com.android.tools.r8.origin.Origin):14:23 -> a
@@ -352,7 +354,7 @@
     19:19:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):187:187 -> a
     20:20:void lambda$run$4(java.lang.String):197:197 -> a
     21:23:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):244:246 -> a
-    24:24:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):363:363 -> a
+    24:24:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):358:358 -> a
     24:24:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):246 -> a
     25:29:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):247:251 -> a
     1:1:void lambda$run$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):102:102 -> b
@@ -361,7 +363,7 @@
     2:2:void com.android.tools.r8.utils.Timing.<init>(java.lang.String):31:31 -> d
     2:2:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):150 -> d
     3:26:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):153:176 -> d
-    27:27:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):359:359 -> d
+    27:27:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):354:354 -> d
     27:27:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):176 -> d
     28:38:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):177:187 -> d
     39:43:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):183:187 -> d
@@ -369,7 +371,7 @@
     83:83:com.android.tools.r8.dex.ClassesChecksum com.android.tools.r8.graph.DexApplication.getChecksums():112:112 -> d
     83:83:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):220 -> d
     84:85:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):221:222 -> d
-    86:86: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 -> d
+    86:86:void com.android.tools.r8.dex.ApplicationWriter.<init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,java.util.List,com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):151:151 -> d
     86:86:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):222 -> d
     87:95:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):224:232 -> d
     96:101:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):227:232 -> d
@@ -562,7 +564,7 @@
     16:16:void com.android.tools.r8.utils.Timing.<init>(java.lang.String):31:31 -> a
     16:16:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):84 -> a
     17:37:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):85:105 -> a
-    38:38: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
+    38:38:void com.android.tools.r8.dex.ApplicationWriter.<init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,java.util.List,com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):151:151 -> a
     38:38:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):105 -> a
     39:47:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):107:115 -> a
     48:53:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):110:115 -> a
@@ -679,13 +681,15 @@
     1:7:void deleteClassesDexFiles(java.nio.file.Path):280:286 -> a
     8:14:void deleteClassesDexFiles(java.nio.file.Path):280:286 -> a
     15:15:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):286:286 -> a
-    1:7:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):246:252 -> accept
-    8:8:java.lang.String com.android.tools.r8.DexIndexedConsumer$ForwardingConsumer.getDexFileName(int):97:97 -> accept
-    8:8:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):252 -> accept
-    9:9:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):252:252 -> accept
-    10:10:void accept(com.android.tools.r8.DataDirectoryResource,com.android.tools.r8.DiagnosticsHandler):257:257 -> accept
-    11:11:void accept(com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):262:262 -> accept
-    1:5:void prepareDirectory():272:276 -> b
+    1:1:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):246:246 -> accept
+    2:6:void prepareDirectory():272:276 -> accept
+    2:6:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):248 -> accept
+    7:9:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):250:252 -> accept
+    10:10:java.lang.String com.android.tools.r8.DexIndexedConsumer$ForwardingConsumer.getDexFileName(int):97:97 -> accept
+    10:10:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):252 -> accept
+    11:11:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):252:252 -> accept
+    12:12:void accept(com.android.tools.r8.DataDirectoryResource,com.android.tools.r8.DiagnosticsHandler):257:257 -> accept
+    13:13:void accept(com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):262:262 -> accept
     1:2:void finished(com.android.tools.r8.DiagnosticsHandler):267:268 -> finished
     1:1:com.android.tools.r8.DataResourceConsumer getDataResourceConsumer():240:240 -> getDataResourceConsumer
     1:1:java.nio.file.Path internalGetOutputPath():312:312 -> internalGetOutputPath
@@ -920,17 +924,18 @@
 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(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
+    java.lang.String outline10(java.lang.StringBuilder,java.lang.String,java.lang.String) -> a
+    java.lang.StringBuilder outline11(com.android.tools.r8.graph.DexType,java.lang.StringBuilder,java.lang.String) -> a
+    java.lang.StringBuilder outline12(java.lang.String) -> a
+    java.lang.StringBuilder outline13(java.lang.String,int,java.lang.String) -> a
     com.android.tools.r8.ir.code.BasicBlock outline2(com.android.tools.r8.ir.code.BasicBlock) -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type outline3(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type) -> a
-    java.lang.String 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
+    java.lang.String outline4(com.android.tools.r8.graph.DexMethod,java.lang.StringBuilder,java.lang.String) -> a
+    java.lang.String outline6(java.lang.String,int) -> a
+    java.lang.String outline8(java.lang.String,java.lang.String) -> a
+    java.lang.String outline9(java.lang.StringBuilder,int,java.lang.String) -> a
+    java.lang.String outline5(com.android.tools.r8.graph.DexType,java.lang.StringBuilder,java.lang.String) -> b
+    java.lang.String outline7(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
@@ -947,12 +952,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):354:354 -> a
+    28:28:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):349:349 -> a
     28:28:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):123 -> a
     28:28:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
     29:41:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):125:137 -> a
     29:41:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
-    42:42:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():342:342 -> a
+    42:42:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():344:344 -> a
     42:42:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):139 -> a
     42:42:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
     43:51:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):139:147 -> a
@@ -1098,13 +1103,13 @@
     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():330:330 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     7:7:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):195 -> a
     8:8:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):196:196 -> a
-    9:9:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():342:342 -> a
+    9:9:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():344:344 -> a
     9:9:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):198 -> a
     10:16:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):198:204 -> a
-    17:17:void com.android.tools.r8.dex.ApplicationWriter.<init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,java.util.List,com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):150:150 -> a
+    17:17:void com.android.tools.r8.dex.ApplicationWriter.<init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,java.util.List,com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):151:151 -> a
     17:17:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):204 -> a
     18:21: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):209:212 -> a
     22:23:java.util.Set filterMissingClasses(java.util.Set,com.android.tools.r8.shaking.ProguardClassFilter):218:219 -> a
@@ -1156,37 +1161,37 @@
     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
+    1236:1241:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):853:858 -> a
+    1242: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):856:861 -> a
+    1248:1248:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22: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):861 -> a
+    1249:1249:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1249:1249:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> 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):861 -> a
+    1250:1250:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):861:861 -> a
+    1251:1254:void computeKotlinInfoForProgramClasses(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):865:868 -> a
+    1255:1255:void lambda$run$12(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):887:887 -> a
+    1256:1256:void lambda$main$13(java.lang.String[]):903:903 -> 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[]):872:873 -> b
+    4:5:void run(java.lang.String[]):873:874 -> b
     6:6:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> b
-    6:6:void run(java.lang.String[]):874 -> b
-    7:7:void run(java.lang.String[]):875:875 -> b
+    6:6:void run(java.lang.String[]):875 -> b
+    7:7:void run(java.lang.String[]):876:876 -> 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[]):874 -> b
-    9:13:void run(java.lang.String[]):878:882 -> b
+    8:8:void run(java.lang.String[]):875 -> b
+    9:13:void run(java.lang.String[]):879:883 -> 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[]):883 -> b
-    15:15:void run(java.lang.String[]):885:885 -> b
+    14:14:void run(java.lang.String[]):884 -> b
+    15:15:void run(java.lang.String[]):886:886 -> 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
+    16:16:void run(java.lang.String[]):886 -> b
+    17:17:void run(java.lang.String[]):889:889 -> 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[]):898:902 -> main
+    1:5:void main(java.lang.String[]):899:903 -> 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):55:55 -> run
@@ -1210,28 +1215,28 @@
     com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration libraryConfiguration -> C
     java.lang.String USAGE_MESSAGE -> E
     com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> B
-    1:558:void <clinit>():56:613 -> <clinit>
+    1:559:void <clinit>():56:614 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ProgramConsumer,java.util.List,com.android.tools.r8.StringConsumer,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.CompilationMode,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean,boolean,boolean,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,java.util.function.Consumer,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.R8Command$1):57:57 -> <init>
     2:2:void <init>(boolean,boolean,com.android.tools.r8.R8Command$1):57:57 -> <init>
-    3:31:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ProgramConsumer,java.util.List,com.android.tools.r8.StringConsumer,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.CompilationMode,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean,boolean,boolean,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,java.util.function.Consumer,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,com.android.tools.r8.features.FeatureSplitConfiguration):706:734 -> <init>
-    32:48:void <init>(boolean,boolean):738:754 -> <init>
-    1:3:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):881:883 -> a
-    1:1:com.android.tools.r8.R8Command$Builder builder():634:634 -> builder
-    2:2:void com.android.tools.r8.R8Command$Builder.<init>():108:108 -> builder
-    2:2:com.android.tools.r8.R8Command$Builder builder():634 -> builder
-    3:3:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):639:639 -> builder
-    1:53:com.android.tools.r8.utils.InternalOptions getInternalOptions():769:821 -> c
-    54:64:com.android.tools.r8.utils.InternalOptions getInternalOptions():818:828 -> c
-    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():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
-    1:1:boolean getEnableTreeShaking():759:759 -> getEnableTreeShaking
-    1:1:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):662:662 -> parse
-    2:2:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):676:676 -> parse
+    3:31:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ProgramConsumer,java.util.List,com.android.tools.r8.StringConsumer,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.CompilationMode,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean,boolean,boolean,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,java.util.function.Consumer,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,com.android.tools.r8.features.FeatureSplitConfiguration):707:735 -> <init>
+    32:48:void <init>(boolean,boolean):739:755 -> <init>
+    1:3:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):882:884 -> a
+    1:1:com.android.tools.r8.R8Command$Builder builder():635:635 -> builder
+    2:2:void com.android.tools.r8.R8Command$Builder.<init>():109:109 -> builder
+    2:2:com.android.tools.r8.R8Command$Builder builder():635 -> builder
+    3:3:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):640:640 -> builder
+    1:53:com.android.tools.r8.utils.InternalOptions getInternalOptions():770:822 -> c
+    54:64:com.android.tools.r8.utils.InternalOptions getInternalOptions():819:829 -> c
+    65:75:com.android.tools.r8.utils.InternalOptions getInternalOptions():826:836 -> c
+    76:86:com.android.tools.r8.utils.InternalOptions getInternalOptions():833:843 -> c
+    87:104:com.android.tools.r8.utils.InternalOptions getInternalOptions():840:857 -> c
+    105:105:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> c
+    105:105:com.android.tools.r8.utils.InternalOptions getInternalOptions():858 -> c
+    106:120:com.android.tools.r8.utils.InternalOptions getInternalOptions():859:873 -> c
+    1:1:boolean getEnableMinification():765:765 -> getEnableMinification
+    1:1:boolean getEnableTreeShaking():760:760 -> getEnableTreeShaking
+    1:1:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):663:663 -> parse
+    2:2:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):677:677 -> parse
 com.android.tools.r8.R8Command$1 -> com.android.tools.r8.R8Command$a:
 com.android.tools.r8.R8Command$Builder -> com.android.tools.r8.R8Command$Builder:
     java.util.List mainDexRules -> r
@@ -1253,75 +1258,75 @@
     com.android.tools.r8.StringConsumer proguardMapConsumer -> A
     com.android.tools.r8.StringConsumer proguardUsageConsumer -> B
     1:1:void <clinit>():64:64 -> <clinit>
-    1:1:void <init>():108:108 -> <init>
-    2:2:void <init>(com.android.tools.r8.DiagnosticsHandler):112:112 -> <init>
-    3:22:void <init>(com.android.tools.r8.DiagnosticsHandler):85:104 -> <init>
+    1:1:void <init>():109:109 -> <init>
+    2:2:void <init>(com.android.tools.r8.DiagnosticsHandler):113:113 -> <init>
+    3:23:void <init>(com.android.tools.r8.DiagnosticsHandler):85:105 -> <init>
     1:1:java.lang.Boolean lambda$new$0(java.lang.String,java.lang.Long):100:100 -> a
-    2:3:void lambda$addMainDexRulesFiles$1(java.nio.file.Path[]):168:169 -> a
-    4:5:void lambda$addMainDexRulesFiles$2(java.util.Collection):178:179 -> a
-    6:7:void lambda$addMainDexRules$3(java.util.List,com.android.tools.r8.origin.Origin):187:188 -> a
-    8:8:void lambda$addMainDexRules$3(java.util.List,com.android.tools.r8.origin.Origin):187:187 -> a
-    9:10:void lambda$addProguardConfigurationFiles$5(java.util.List):205:206 -> a
-    11:11:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):376:376 -> a
-    12:14:void lambda$makeR8Command$7(com.android.tools.r8.DataResourceProvider$Visitor,com.android.tools.r8.utils.Reporter,com.android.tools.r8.DataResourceProvider):495:497 -> a
-    1:1:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):365:365 -> addFeatureSplit
+    2:3:void lambda$addMainDexRulesFiles$1(java.nio.file.Path[]):169:170 -> a
+    4:5:void lambda$addMainDexRulesFiles$2(java.util.Collection):179:180 -> a
+    6:7:void lambda$addMainDexRules$3(java.util.List,com.android.tools.r8.origin.Origin):188:189 -> a
+    8:8:void lambda$addMainDexRules$3(java.util.List,com.android.tools.r8.origin.Origin):188:188 -> a
+    9:10:void lambda$addProguardConfigurationFiles$5(java.util.List):206:207 -> a
+    11:11:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):377:377 -> a
+    12:14:void lambda$makeR8Command$7(com.android.tools.r8.DataResourceProvider$Visitor,com.android.tools.r8.utils.Reporter,com.android.tools.r8.DataResourceProvider):496:498 -> a
+    1:1:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):366:366 -> addFeatureSplit
     2:2:com.android.tools.r8.FeatureSplit$Builder com.android.tools.r8.FeatureSplit.builder(com.android.tools.r8.DiagnosticsHandler):50:50 -> addFeatureSplit
-    2:2:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):365 -> addFeatureSplit
-    3:5:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):365:367 -> addFeatureSplit
-    1:1:com.android.tools.r8.R8Command$Builder addMainDexRules(java.util.List,com.android.tools.r8.origin.Origin):187:187 -> addMainDexRules
-    1:1:com.android.tools.r8.R8Command$Builder addMainDexRulesFiles(java.nio.file.Path[]):167:167 -> addMainDexRulesFiles
-    2:2:com.android.tools.r8.R8Command$Builder addMainDexRulesFiles(java.util.Collection):177:177 -> addMainDexRulesFiles
+    2:2:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):366 -> addFeatureSplit
+    3:5:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):366:368 -> addFeatureSplit
+    1:1:com.android.tools.r8.R8Command$Builder addMainDexRules(java.util.List,com.android.tools.r8.origin.Origin):188:188 -> addMainDexRules
+    1:1:com.android.tools.r8.R8Command$Builder addMainDexRulesFiles(java.nio.file.Path[]):168:168 -> addMainDexRulesFiles
+    2:2:com.android.tools.r8.R8Command$Builder addMainDexRulesFiles(java.util.Collection):178:178 -> addMainDexRulesFiles
     1:1:com.android.tools.r8.BaseCommand$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):64:64 -> addProgramResourceProvider
-    2:2:com.android.tools.r8.R8Command$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):352:352 -> addProgramResourceProvider
-    1:1:com.android.tools.r8.R8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):214:214 -> addProguardConfiguration
-    1:1:com.android.tools.r8.R8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):194:194 -> addProguardConfigurationFiles
-    2:2:com.android.tools.r8.R8Command$Builder addProguardConfigurationFiles(java.util.List):204:204 -> addProguardConfigurationFiles
-    1:1:void setDisableVerticalClassMerging(boolean):130:130 -> b
-    2:3:void lambda$addProguardConfigurationFiles$4(java.nio.file.Path[]):195:196 -> b
-    4:5:void lambda$addProguardConfiguration$6(java.util.List,com.android.tools.r8.origin.Origin):214:215 -> b
-    6:6:void lambda$addProguardConfiguration$6(java.util.List,com.android.tools.r8.origin.Origin):214:214 -> b
+    2:2:com.android.tools.r8.R8Command$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):353:353 -> addProgramResourceProvider
+    1:1:com.android.tools.r8.R8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):215:215 -> addProguardConfiguration
+    1:1:com.android.tools.r8.R8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):195:195 -> addProguardConfigurationFiles
+    2:2:com.android.tools.r8.R8Command$Builder addProguardConfigurationFiles(java.util.List):205:205 -> addProguardConfigurationFiles
+    1:1:void setDisableVerticalClassMerging(boolean):131:131 -> b
+    2:3:void lambda$addProguardConfigurationFiles$4(java.nio.file.Path[]):196:197 -> b
+    4:5:void lambda$addProguardConfiguration$6(java.util.List,com.android.tools.r8.origin.Origin):215:216 -> b
+    6:6:void lambda$addProguardConfiguration$6(java.util.List,com.android.tools.r8.origin.Origin):215:215 -> b
     1:1:com.android.tools.r8.BaseCommand makeCommand():64:64 -> c
-    2:5:com.android.tools.r8.R8Command makeCommand():427:430 -> c
-    6:6:com.android.tools.r8.R8Command makeCommand():428:428 -> c
+    2:5:com.android.tools.r8.R8Command makeCommand():428:431 -> c
+    6:6:com.android.tools.r8.R8Command makeCommand():429:429 -> c
     com.android.tools.r8.BaseCommand$Builder self() -> d
-    1:18:void validate():381:398 -> e
-    19:44:void validate():396:421 -> e
-    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():140:140 -> f
-    1:1:void internalForceProguardCompatibility():126:126 -> j
-    1:7:com.android.tools.r8.R8Command makeR8Command():434:440 -> k
+    1:18:void validate():382:399 -> e
+    19:44:void validate():397:422 -> e
+    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():141:141 -> f
+    1:1:void internalForceProguardCompatibility():127:127 -> j
+    1:7:com.android.tools.r8.R8Command makeR8Command():435:441 -> k
     8:8:void com.android.tools.r8.shaking.ProguardConfigurationParser.<init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):110:110 -> k
-    8:8:com.android.tools.r8.R8Command makeR8Command():440 -> k
-    9:113:com.android.tools.r8.R8Command makeR8Command():442:546 -> k
-    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
-    1:1:com.android.tools.r8.R8Command$Builder setKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):297:297 -> setKeptGraphConsumer
-    1:1:com.android.tools.r8.R8Command$Builder setMainDexKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):305:305 -> setMainDexKeptGraphConsumer
+    8:8:com.android.tools.r8.R8Command makeR8Command():441 -> k
+    9:113:com.android.tools.r8.R8Command makeR8Command():443:547 -> k
+    1:1:com.android.tools.r8.R8Command$Builder setDesugaredLibraryKeepRuleConsumer(com.android.tools.r8.StringConsumer):255:255 -> setDesugaredLibraryKeepRuleConsumer
+    1:1:com.android.tools.r8.R8Command$Builder setDisableMinification(boolean):162:162 -> setDisableMinification
+    1:1:com.android.tools.r8.R8Command$Builder setDisableTreeShaking(boolean):151:151 -> setDisableTreeShaking
+    1:1:com.android.tools.r8.R8Command$Builder setKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):298:298 -> setKeptGraphConsumer
+    1:1:com.android.tools.r8.R8Command$Builder setMainDexKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):306:306 -> setMainDexKeptGraphConsumer
     1:1:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):64:64 -> setOutput
     2:2:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):64:64 -> setOutput
-    3:3:com.android.tools.r8.R8Command$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):324:324 -> setOutput
-    4:4:com.android.tools.r8.R8Command$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):347:347 -> setOutput
-    1:1:com.android.tools.r8.R8Command$Builder setProguardConfigurationConsumer(com.android.tools.r8.StringConsumer):289:289 -> setProguardConfigurationConsumer
-    1:1:com.android.tools.r8.R8Command$Builder setProguardMapConsumer(com.android.tools.r8.StringConsumer):243:243 -> setProguardMapConsumer
-    1:2:com.android.tools.r8.R8Command$Builder setProguardMapOutputPath(java.nio.file.Path):229:230 -> setProguardMapOutputPath
-    1:1:com.android.tools.r8.R8Command$Builder setProguardSeedsConsumer(com.android.tools.r8.StringConsumer):278:278 -> setProguardSeedsConsumer
-    1:1:com.android.tools.r8.R8Command$Builder setProguardUsageConsumer(com.android.tools.r8.StringConsumer):266:266 -> setProguardUsageConsumer
+    3:3:com.android.tools.r8.R8Command$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):325:325 -> setOutput
+    4:4:com.android.tools.r8.R8Command$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):348:348 -> setOutput
+    1:1:com.android.tools.r8.R8Command$Builder setProguardConfigurationConsumer(com.android.tools.r8.StringConsumer):290:290 -> setProguardConfigurationConsumer
+    1:1:com.android.tools.r8.R8Command$Builder setProguardMapConsumer(com.android.tools.r8.StringConsumer):244:244 -> setProguardMapConsumer
+    1:2:com.android.tools.r8.R8Command$Builder setProguardMapOutputPath(java.nio.file.Path):230:231 -> setProguardMapOutputPath
+    1:1:com.android.tools.r8.R8Command$Builder setProguardSeedsConsumer(com.android.tools.r8.StringConsumer):279:279 -> setProguardSeedsConsumer
+    1:1:com.android.tools.r8.R8Command$Builder setProguardUsageConsumer(com.android.tools.r8.StringConsumer):267:267 -> setProguardUsageConsumer
 com.android.tools.r8.R8Command$Builder$1 -> com.android.tools.r8.R8Command$Builder$a:
     com.android.tools.r8.shaking.ProguardConfigurationParser val$parser -> a
     com.android.tools.r8.utils.Reporter val$reporter -> b
-    1:1:void <init>(com.android.tools.r8.R8Command$Builder,com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.utils.Reporter):466:466 -> <init>
-    1:4:void visit(com.android.tools.r8.DataEntryResource):474:477 -> visit
+    1:1:void <init>(com.android.tools.r8.R8Command$Builder,com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.utils.Reporter):467:467 -> <init>
+    1:4:void visit(com.android.tools.r8.DataEntryResource):475:478 -> visit
     5:5:void com.android.tools.r8.shaking.ProguardConfigurationSourceBytes.<init>(java.io.InputStream,com.android.tools.r8.origin.Origin):24:24 -> visit
-    5:5:void visit(com.android.tools.r8.DataEntryResource):477 -> visit
-    6:6:void visit(com.android.tools.r8.DataEntryResource):478:478 -> visit
+    5:5:void visit(com.android.tools.r8.DataEntryResource):478 -> visit
+    6:6:void visit(com.android.tools.r8.DataEntryResource):479:479 -> visit
     7:7:void com.android.tools.r8.shaking.ProguardConfigurationParser.parse(com.android.tools.r8.shaking.ProguardConfigurationSource):173:173 -> visit
-    7:7:void visit(com.android.tools.r8.DataEntryResource):478 -> visit
-    8:8:void visit(com.android.tools.r8.DataEntryResource):479:479 -> visit
+    7:7:void visit(com.android.tools.r8.DataEntryResource):479 -> visit
+    8:8:void visit(com.android.tools.r8.DataEntryResource):480:480 -> visit
     9:9:void com.android.tools.r8.shaking.ProguardConfigurationParser.parse(com.android.tools.r8.shaking.ProguardConfigurationSource):173:173 -> visit
-    9:9:void visit(com.android.tools.r8.DataEntryResource):478 -> visit
-    10:18:void visit(com.android.tools.r8.DataEntryResource):475:483 -> visit
-    19:20:void visit(com.android.tools.r8.DataEntryResource):480:481 -> visit
-    21:21:void visit(com.android.tools.r8.DataEntryResource):480:480 -> visit
+    9:9:void visit(com.android.tools.r8.DataEntryResource):479 -> visit
+    10:18:void visit(com.android.tools.r8.DataEntryResource):476:484 -> visit
+    19:20:void visit(com.android.tools.r8.DataEntryResource):481:482 -> visit
+    21:21:void visit(com.android.tools.r8.DataEntryResource):481:481 -> visit
 com.android.tools.r8.R8Command$Builder$DefaultR8DiagnosticsHandler -> com.android.tools.r8.R8Command$Builder$b:
     1:1:void <init>():67:67 -> <init>
     2:2:void <init>(com.android.tools.r8.R8Command$1):67:67 -> <init>
@@ -1329,12 +1334,12 @@
     7:14:void error(com.android.tools.r8.Diagnostic):74:81 -> error
 com.android.tools.r8.R8Command$EnsureNonDexProgramResourceProvider -> com.android.tools.r8.R8Command$b:
     com.android.tools.r8.ProgramResourceProvider provider -> a
-    1:2:void <init>(com.android.tools.r8.ProgramResourceProvider):591:592 -> <init>
-    1:1:com.android.tools.r8.DataResourceProvider getDataResourceProvider():609:609 -> getDataResourceProvider
-    1:4:java.util.Collection getProgramResources():597:600 -> getProgramResources
+    1:2:void <init>(com.android.tools.r8.ProgramResourceProvider):592:593 -> <init>
+    1:1:com.android.tools.r8.DataResourceProvider getDataResourceProvider():610:610 -> getDataResourceProvider
+    1:4:java.util.Collection getProgramResources():598:601 -> getProgramResources
 com.android.tools.r8.R8Command$StandardOutConsumer -> com.android.tools.r8.R8Command$c:
-    1:1:void <init>(com.android.tools.r8.StringConsumer):892:892 -> <init>
-    1:2:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):897:898 -> accept
+    1:1:void <init>(com.android.tools.r8.StringConsumer):893:893 -> <init>
+    1:2:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):898:899 -> accept
 com.android.tools.r8.R8CommandParser -> com.android.tools.r8.s:
     java.util.Set OPTIONS_WITH_PARAMETER -> a
     java.lang.String USAGE_MESSAGE -> b
@@ -1395,12 +1400,12 @@
     1:6:void visit():157:162 -> a
     7:10:void processFieldValue(com.android.tools.r8.graph.DexValue):178:181 -> a
     7:10:void visit():164 -> a
-    11:11:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():439:439 -> a
+    11:11:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():446:446 -> a
     11:11:void processFieldValue(com.android.tools.r8.graph.DexValue):181 -> a
     11:11:void visit():164 -> a
     12:17:void processFieldValue(com.android.tools.r8.graph.DexValue):182:187 -> a
     12:17:void visit():164 -> a
-    18:18:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():439:439 -> a
+    18:18:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():446:446 -> a
     18:18:void processFieldValue(com.android.tools.r8.graph.DexValue):187 -> a
     18:18:void visit():164 -> a
     19:19:void processFieldValue(com.android.tools.r8.graph.DexValue):188:188 -> a
@@ -1575,9 +1580,9 @@
     1:5:void finished(com.android.tools.r8.DiagnosticsHandler):207:211 -> finished
 com.android.tools.r8.StringResource -> com.android.tools.r8.w:
     java.lang.String getString() -> a
-    1:1:com.android.tools.r8.StringResource fromString(java.lang.String,com.android.tools.r8.origin.Origin):26:26 -> a
-    2:2:com.android.tools.r8.StringResource fromFile(java.nio.file.Path):37:37 -> a
-    3:3:com.android.tools.r8.StringResource fromFile(java.nio.file.Path,java.nio.charset.Charset):49:49 -> a
+    1:1:com.android.tools.r8.StringResource fromFile(java.nio.file.Path):37:37 -> a
+    2:2:com.android.tools.r8.StringResource fromFile(java.nio.file.Path,java.nio.charset.Charset):49:49 -> a
+    2:2:com.android.tools.r8.StringResource fromFile(java.nio.file.Path):37 -> a
 com.android.tools.r8.StringResource$1 -> com.android.tools.r8.t:
 com.android.tools.r8.StringResource$FileResource -> com.android.tools.r8.u:
     java.nio.charset.Charset charset -> b
@@ -2007,13 +2012,13 @@
     53:53:com.android.tools.r8.graph.DexType join(java.util.Set):196:196 -> a
     54:64:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo join(com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):205:215 -> a
     65:70:java.util.Map computeVerificationTypes():223:228 -> a
-    71:71:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
+    71:71:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
     71:71:java.util.Map computeVerificationTypes():228 -> a
     72:128:java.util.Map computeVerificationTypes():231:287 -> a
     129:131:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.ir.code.Value):313:315 -> a
     129:131:java.util.Map computeVerificationTypes():288 -> a
     132:151:java.util.Map computeVerificationTypes():290:309 -> a
-    152:152:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
+    152:152:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
     152:152:java.util.Map computeVerificationTypes():228 -> a
     153:158:void addUsers(com.android.tools.r8.ir.code.Value,java.util.Set):319:324 -> a
     1:19:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):155:173 -> b
@@ -2202,7 +2207,7 @@
     3:3:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):45:45 -> a
     4:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):56:57 -> a
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):56:56 -> a
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodHandle():276:276 -> a
+    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodHandle():275:275 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):66 -> a
     boolean canThrow() -> e
     1:1:com.android.tools.r8.graph.DexMethodHandle getHandle():30:30 -> q
@@ -2214,7 +2219,7 @@
     3:3:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):45:45 -> a
     4:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):56:57 -> a
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):56:56 -> a
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodType():280:280 -> a
+    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodType():279:279 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):66 -> a
     boolean canThrow() -> e
     1:1:com.android.tools.r8.graph.DexProto getType():30:30 -> q
@@ -2534,7 +2539,7 @@
     1:5:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):47:51 -> a
     6:7:java.lang.Object decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):60:61 -> a
     6:7:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):51 -> a
-    8:8:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():439:439 -> a
+    8:8:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():446:446 -> a
     8:8:java.lang.Object decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):61 -> a
     8:8:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):51 -> a
     9:23:java.lang.Object decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):61:75 -> a
@@ -2637,7 +2642,7 @@
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):35:35 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):40:40 -> a
     3:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):50:51 -> a
-    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():212:212 -> a
+    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():211:211 -> a
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):60 -> a
     boolean canThrow() -> e
     1:1:com.android.tools.r8.ir.code.Monitor$Type getType():30:30 -> q
@@ -2666,7 +2671,7 @@
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):36:36 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):41:41 -> a
     3:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):79:80 -> a
-    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():272:272 -> a
+    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():271:271 -> a
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):89 -> a
     1:14:int getAsmOpcode():45:58 -> q
 com.android.tools.r8.cf.code.CfNew -> com.android.tools.r8.x.m.L:
@@ -2729,7 +2734,7 @@
     17:17:com.android.tools.r8.cf.code.CfNumberConversion fromAsm(int):116:116 -> a
     18:18:com.android.tools.r8.cf.code.CfNumberConversion fromAsm(int):114:114 -> a
     19:20:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):150:151 -> a
-    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():272:272 -> a
+    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():271:271 -> a
     21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):160 -> a
     1:53:int getAsmOpcode():55:107 -> q
     54:62:int getAsmOpcode():96:104 -> q
@@ -2755,7 +2760,7 @@
     14:14:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):58:58 -> a
     15:15:void print(com.android.tools.r8.cf.CfPrinter):63:63 -> a
     16:17:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):73:74 -> a
-    18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():244:244 -> a
+    18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():243:243 -> a
     18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):83 -> a
     boolean isJump() -> l
     boolean isReturn() -> o
@@ -2765,7 +2770,7 @@
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):28:28 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):33:33 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):43:43 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():244:244 -> a
+    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():243:243 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):52 -> a
     boolean isJump() -> l
     boolean isReturn() -> o
@@ -2933,7 +2938,7 @@
     16:17:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):79:80 -> a
     18:18:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     18:18:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):80 -> a
-    19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStore():260:260 -> a
+    19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStore():259:259 -> a
     19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):94 -> a
     boolean emitsIR() -> f
     boolean isStore() -> p
@@ -12840,7 +12845,7 @@
     135:139:void lambda$readMainDexList$2(com.android.tools.r8.graph.DexApplication$Builder):205:209 -> a
     140:140:void lambda$readMainDexList$2(com.android.tools.r8.graph.DexApplication$Builder):205:205 -> a
     141:141:com.android.tools.r8.graph.DexType lambda$readMainDexList$1(java.lang.String):208:208 -> a
-    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     142:142:com.android.tools.r8.graph.DexType lambda$readMainDexList$1(java.lang.String):208 -> a
     1:1:com.android.tools.r8.utils.AndroidApp access$300(com.android.tools.r8.dex.ApplicationReader):56:56 -> b
 com.android.tools.r8.dex.ApplicationReader$ClassReader -> com.android.tools.r8.A.a:
@@ -12885,134 +12890,149 @@
     com.android.tools.r8.naming.NamingLens namingLens -> d
     java.util.List markerStrings -> g
     com.android.tools.r8.naming.ProguardMapSupplier proguardMapSupplier -> j
-    1:1:void <clinit>():70:70 -> <clinit>
-    1:12:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,java.util.List,com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier,com.android.tools.r8.DexIndexedConsumer):171:182 -> <init>
-    1:1:void encodeChecksums(java.lang.Iterable):212:212 -> a
-    2:2:java.util.HashMap com.android.tools.r8.com.google.common.collect.Maps.newHashMap():283:283 -> a
+    1:1:void <clinit>():71:71 -> <clinit>
+    1:12:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,java.util.List,com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier,com.android.tools.r8.DexIndexedConsumer):172:183 -> <init>
+    1:1:void encodeChecksums(java.lang.Iterable):213:213 -> a
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.dex.ClassesChecksum.getChecksums():40:40 -> a
     2:2:void encodeChecksums(java.lang.Iterable):213 -> a
-    3:6:void encodeChecksums(java.lang.Iterable):214:217 -> a
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    7:7:void encodeChecksums(java.lang.Iterable):218 -> a
-    8:11:void encodeChecksums(java.lang.Iterable):218:221 -> a
-    12:12:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    12:12:void encodeChecksums(java.lang.Iterable):221 -> a
-    13:25:void encodeChecksums(java.lang.Iterable):221:233 -> a
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    26:26:void encodeChecksums(java.lang.Iterable):234 -> a
-    27:31:void encodeChecksums(java.lang.Iterable):234:238 -> a
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    32:32:void encodeChecksums(java.lang.Iterable):239 -> a
-    33:49:void encodeChecksums(java.lang.Iterable):239:255 -> a
-    50:91:void write(java.util.concurrent.ExecutorService):260:301 -> a
-    92:156:void write(java.util.concurrent.ExecutorService):300:364 -> a
-    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():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():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
-    187:192:com.android.tools.r8.dex.FileWriter$ByteBufferResult writeDexFile(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.ByteBufferProvider):620:625 -> a
-    187:192:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):328 -> a
-    193:201:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):329:337 -> a
-    202:212:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):334:344 -> a
-    213:222:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):341:350 -> a
-    223:226:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):377:380 -> a
-    227:233:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):378:384 -> a
-    234:236:boolean validateProguardMapParses(java.lang.String):487:489 -> a
-    234:236:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):384 -> a
-    237:244:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):384:391 -> a
-    245:292:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):390:437 -> a
-    293:293:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):436:436 -> a
-    294:294:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):413:413 -> a
-    295:295:java.lang.String com.android.tools.r8.utils.DescriptorUtils.descriptorToJavaType(java.lang.String):140:140 -> a
-    295:295:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):412 -> a
-    296:300:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):417:421 -> a
-    301:309:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):416:424 -> a
-    310:310:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):415:415 -> a
-    311:311:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):414:414 -> a
-    312:345:void adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):447:480 -> a
-    346:346:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26:26 -> a
-    346:346:void adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):480 -> a
-    347:347:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
-    347:347:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26 -> a
-    347:347:void adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):480 -> a
-    348:348:void adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):480:480 -> a
-    349:362:void insertAttributeAnnotations():497:510 -> a
-    363:363:void insertAttributeAnnotations():509:509 -> a
-    364:372:void insertAttributeAnnotations():508:516 -> a
-    373:373:void insertAttributeAnnotations():515:515 -> a
-    374:390:void insertAttributeAnnotations():514:530 -> a
-    391:397:void insertAttributeAnnotations():529:535 -> a
-    398:407:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createInnerClassAnnotation(com.android.tools.r8.graph.DexString,int,com.android.tools.r8.graph.DexItemFactory):142:151 -> a
-    398:407:void insertAttributeAnnotations():533 -> a
-    408:416:void insertAttributeAnnotations():532:540 -> a
-    417:417:void insertAttributeAnnotations():539:539 -> a
-    418:429:void insertAttributeAnnotations():538:549 -> a
-    430:440:void insertAttributeAnnotations():548:558 -> a
-    441:441:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):72:72 -> a
-    441:441:void insertAttributeAnnotations():556 -> a
-    442:442:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Class,int):49:49 -> a
-    442:442:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):72 -> a
-    442:442:void insertAttributeAnnotations():556 -> a
-    443:444:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):73:74 -> a
-    443:444:void insertAttributeAnnotations():556 -> a
-    445:454:void insertAttributeAnnotations():556:565 -> a
-    455:457:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):581:583 -> a
-    458:458:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMethodBacking():21:21 -> a
-    458:458:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):584 -> a
-    459:460:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):587:588 -> a
-    461:461:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMethodBacking():21:21 -> a
-    461:461:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):589 -> a
-    462:465:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):594:597 -> a
-    466:466:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMapBacking(java.util.Map):25:25 -> a
-    466:466:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):613 -> a
-    467:477:void lambda$rewriteCodeWithJumboStrings$3(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexApplication,java.util.Map,boolean,com.android.tools.r8.graph.DexEncodedMethod):599:609 -> a
-    478:478:java.lang.String mapMainDexListName(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):629:629 -> a
-    478:478:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):638 -> a
-    479:479:java.lang.String com.android.tools.r8.utils.DescriptorUtils.descriptorToJavaType(java.lang.String):140:140 -> a
-    479:479:java.lang.String mapMainDexListName(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):629 -> a
-    479:479:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):638 -> a
-    480:480:java.lang.String mapMainDexListName(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):630:630 -> a
-    480:480:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):638 -> a
-    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():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():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
+    3:3:java.util.HashMap com.android.tools.r8.com.google.common.collect.Maps.newHashMap():283:283 -> a
+    3:3:void encodeChecksums(java.lang.Iterable):214 -> a
+    4:7:void encodeChecksums(java.lang.Iterable):215:218 -> a
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
+    8:8:void encodeChecksums(java.lang.Iterable):219 -> a
+    9:9:void encodeChecksums(java.lang.Iterable):219:219 -> a
+    10:10:java.lang.String com.android.tools.r8.graph.DexProgramClass.toSourceString():214:214 -> a
+    10:10:void encodeChecksums(java.lang.Iterable):222 -> a
+    11:16:void encodeChecksums(java.lang.Iterable):223:228 -> a
+    17:17:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    17:17:void encodeChecksums(java.lang.Iterable):228 -> a
+    18:18:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    18:18:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    18:18:void encodeChecksums(java.lang.Iterable):228 -> a
+    19:19:void encodeChecksums(java.lang.Iterable):228:228 -> a
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
+    20:20:void encodeChecksums(java.lang.Iterable):226 -> a
+    21:21:void encodeChecksums(java.lang.Iterable):226:226 -> a
+    22:41:void encodeChecksums(java.lang.Iterable):225:244 -> a
+    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
+    42:42:void encodeChecksums(java.lang.Iterable):245 -> a
+    43:47:void encodeChecksums(java.lang.Iterable):245:249 -> a
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
+    48:48:void encodeChecksums(java.lang.Iterable):250 -> a
+    49:62:void encodeChecksums(java.lang.Iterable):250:263 -> a
+    63:63:com.android.tools.r8.dex.ClassesChecksum com.android.tools.r8.dex.ClassesChecksum.addChecksum(java.lang.String,java.lang.Long):35:35 -> a
+    63:63:void encodeChecksums(java.lang.Iterable):264 -> a
+    64:64:void encodeChecksums(java.lang.Iterable):266:266 -> a
+    65:106:void write(java.util.concurrent.ExecutorService):271:312 -> a
+    107:171:void write(java.util.concurrent.ExecutorService):311:375 -> a
+    172:180:void write(java.util.concurrent.ExecutorService):369:377 -> a
+    181:181:void lambda$write$0(com.android.tools.r8.dex.ApplicationWriter$SortAnnotations,com.android.tools.r8.graph.DexProgramClass):305:305 -> a
+    182:186:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):316:320 -> a
+    187:187:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():340:340 -> a
+    187:187:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):320 -> a
+    188:195:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):323:330 -> a
+    196:196:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():336:336 -> a
+    196:196:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):330 -> a
+    197:200:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):334:337 -> a
+    201:201:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):336:336 -> a
+    202:207:com.android.tools.r8.dex.FileWriter$ByteBufferResult writeDexFile(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.ByteBufferProvider):631:636 -> a
+    202:207:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):339 -> a
+    208:216:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):340:348 -> a
+    217:227:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):345:355 -> a
+    228:237:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):352:361 -> a
+    238:241:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):388:391 -> a
+    242:248:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):389:395 -> a
+    249:251:boolean validateProguardMapParses(java.lang.String):498:500 -> a
+    249:251:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):395 -> a
+    252:259:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):395:402 -> a
+    260:307:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):401:448 -> a
+    308:308:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):447:447 -> a
+    309:309:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):424:424 -> a
+    310:310:java.lang.String com.android.tools.r8.utils.DescriptorUtils.descriptorToJavaType(java.lang.String):140:140 -> a
+    310:310:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):423 -> a
+    311:315:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):428:432 -> a
+    316:324:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):427:435 -> a
+    325:325:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):426:426 -> a
+    326:326:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):425:425 -> a
+    327:360:void adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):458:491 -> a
+    361:361:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26:26 -> a
+    361:361:void adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):491 -> a
+    362:362:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    362:362:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26 -> a
+    362:362:void adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):491 -> a
+    363:363:void adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):491:491 -> a
+    364:377:void insertAttributeAnnotations():508:521 -> a
+    378:378:void insertAttributeAnnotations():520:520 -> a
+    379:387:void insertAttributeAnnotations():519:527 -> a
+    388:388:void insertAttributeAnnotations():526:526 -> a
+    389:405:void insertAttributeAnnotations():525:541 -> a
+    406:412:void insertAttributeAnnotations():540:546 -> a
+    413:422:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createInnerClassAnnotation(com.android.tools.r8.graph.DexString,int,com.android.tools.r8.graph.DexItemFactory):142:151 -> a
+    413:422:void insertAttributeAnnotations():544 -> a
+    423:431:void insertAttributeAnnotations():543:551 -> a
+    432:432:void insertAttributeAnnotations():550:550 -> a
+    433:444:void insertAttributeAnnotations():549:560 -> a
+    445:455:void insertAttributeAnnotations():559:569 -> a
+    456:456:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):72:72 -> a
+    456:456:void insertAttributeAnnotations():567 -> a
+    457:457:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Class,int):49:49 -> a
+    457:457:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):72 -> a
+    457:457:void insertAttributeAnnotations():567 -> a
+    458:459:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):73:74 -> a
+    458:459:void insertAttributeAnnotations():567 -> a
+    460:469:void insertAttributeAnnotations():567:576 -> a
+    470:472:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):592:594 -> a
+    473:473:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMethodBacking():21:21 -> a
+    473:473:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):595 -> a
+    474:475:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):598:599 -> a
+    476:476:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMethodBacking():21:21 -> a
+    476:476:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):600 -> a
+    477:480:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):605:608 -> a
+    481:481:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMapBacking(java.util.Map):25:25 -> a
+    481:481:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):624 -> a
+    482:492:void lambda$rewriteCodeWithJumboStrings$3(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexApplication,java.util.Map,boolean,com.android.tools.r8.graph.DexEncodedMethod):610:620 -> a
+    493:493:java.lang.String mapMainDexListName(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):640:640 -> a
+    493:493:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):649 -> a
+    494:494:java.lang.String com.android.tools.r8.utils.DescriptorUtils.descriptorToJavaType(java.lang.String):140:140 -> a
+    494:494:java.lang.String mapMainDexListName(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):640 -> a
+    494:494:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):649 -> a
+    495:495:java.lang.String mapMainDexListName(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):641:641 -> a
+    495:495:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):649 -> a
+    496:496:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):649:649 -> a
+    497:502:java.lang.String writeMainDexList(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):645:650 -> a
+    1:1:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):190:190 -> b
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():328:328 -> b
+    2:2:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):190 -> b
+    3:3:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):191:191 -> b
+    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():340:340 -> b
+    4:4:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):192 -> b
+    5:15:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):192:202 -> b
 com.android.tools.r8.dex.ApplicationWriter$1 -> com.android.tools.r8.A.d:
     com.android.tools.r8.dex.ResourceAdapter val$resourceAdapter -> a
     com.android.tools.r8.DataResourceConsumer val$dataResourceConsumer -> b
     java.util.Set val$generatedResourceNames -> d
     com.android.tools.r8.utils.InternalOptions val$options -> c
-    1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,java.util.Set):452:452 -> <init>
-    1:4:void visit(com.android.tools.r8.DataDirectoryResource):455:458 -> visit
-    5:5:void visit(com.android.tools.r8.DataEntryResource):464:464 -> visit
+    1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,java.util.Set):463:463 -> <init>
+    1:4:void visit(com.android.tools.r8.DataDirectoryResource):466:469 -> visit
+    5:5:void visit(com.android.tools.r8.DataEntryResource):475:475 -> visit
     6:6:boolean com.android.tools.r8.dex.ResourceAdapter.isService(com.android.tools.r8.DataEntryResource):97:97 -> visit
-    6:6:void visit(com.android.tools.r8.DataEntryResource):464 -> visit
-    7:12:void visit(com.android.tools.r8.DataEntryResource):469:474 -> visit
-    13:16:void visit(com.android.tools.r8.DataEntryResource):473:476 -> visit
+    6:6:void visit(com.android.tools.r8.DataEntryResource):475 -> visit
+    7:12:void visit(com.android.tools.r8.DataEntryResource):480:485 -> visit
+    13:16:void visit(com.android.tools.r8.DataEntryResource):484:487 -> visit
     17:17:boolean com.android.tools.r8.dex.ResourceAdapter.isService(com.android.tools.r8.DataEntryResource):97:97 -> visit
-    17:17:void visit(com.android.tools.r8.DataEntryResource):464 -> visit
+    17:17:void visit(com.android.tools.r8.DataEntryResource):475 -> visit
 com.android.tools.r8.dex.ApplicationWriter$SortAnnotations -> com.android.tools.r8.A.e:
-    1:1:void <init>():84:84 -> <init>
-    2:2:void <init>(com.android.tools.r8.dex.ApplicationWriter$1):84:84 -> <init>
+    1:1:void <init>():85:85 -> <init>
+    2:2:void <init>(com.android.tools.r8.dex.ApplicationWriter$1):85:85 -> <init>
     boolean add(com.android.tools.r8.graph.DexCode) -> a
     boolean add(com.android.tools.r8.graph.DexDebugInfo) -> a
     boolean add(com.android.tools.r8.graph.DexProgramClass) -> a
     boolean add(com.android.tools.r8.graph.DexTypeList) -> a
     boolean add(com.android.tools.r8.graph.ParameterAnnotationsList) -> a
     boolean setAnnotationsDirectoryForClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationDirectory) -> a
-    1:1:boolean add(com.android.tools.r8.graph.DexAnnotationSet):89:89 -> a
-    2:2:boolean add(com.android.tools.r8.graph.DexAnnotation):96:96 -> a
-    3:4:boolean add(com.android.tools.r8.graph.DexEncodedArray):103:104 -> a
+    1:1:boolean add(com.android.tools.r8.graph.DexAnnotationSet):90:90 -> a
+    2:2:boolean add(com.android.tools.r8.graph.DexAnnotation):97:97 -> a
+    3:4:boolean add(com.android.tools.r8.graph.DexEncodedArray):104:105 -> a
 com.android.tools.r8.dex.BinaryReader -> com.android.tools.r8.A.g:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.dex.CompatByteBuffer buffer -> b
@@ -13035,17 +13055,16 @@
     3:3:void <init>(com.android.tools.r8.com.google.gson.JsonObject):29:29 -> <init>
     4:13:void <init>(com.android.tools.r8.com.google.gson.JsonObject):21:30 -> <init>
     1:1:com.android.tools.r8.dex.ClassesChecksum addChecksum(java.lang.String,java.lang.Long):35:35 -> a
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap getChecksums():40:40 -> a
-    3:4:void lambda$merge$1(java.util.Map$Entry):45:46 -> a
-    5:5:void lambda$merge$1(java.util.Map$Entry):45:45 -> a
-    6:6:com.android.tools.r8.dex.ClassesChecksum merge(com.android.tools.r8.dex.ClassesChecksum):45:45 -> a
-    7:7:void lambda$toString$2(com.android.tools.r8.com.google.gson.JsonObject,java.util.Map$Entry):59:59 -> a
-    8:14:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):66:72 -> a
-    15:15:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonObject():55:55 -> a
-    15:15:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):73 -> a
-    16:16:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):74:74 -> a
-    17:17:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonObject():55:55 -> a
-    17:17:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):73 -> a
+    2:3:void lambda$merge$1(java.util.Map$Entry):45:46 -> a
+    4:4:void lambda$merge$1(java.util.Map$Entry):45:45 -> a
+    5:5:com.android.tools.r8.dex.ClassesChecksum merge(com.android.tools.r8.dex.ClassesChecksum):45:45 -> a
+    6:6:void lambda$toString$2(com.android.tools.r8.com.google.gson.JsonObject,java.util.Map$Entry):59:59 -> a
+    7:13:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):66:72 -> a
+    14:14:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonObject():55:55 -> a
+    14:14:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):73 -> a
+    15:15:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):74:74 -> a
+    16:16:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonObject():55:55 -> a
+    16:16:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):73 -> a
     1:1:void lambda$new$0(java.util.Map$Entry):31:31 -> b
     1:7:java.lang.String toString():54:60 -> toString
 com.android.tools.r8.dex.CodeToKeep -> com.android.tools.r8.A.k:
@@ -13056,7 +13075,7 @@
     void recordField(com.android.tools.r8.graph.DexField) -> a
     void recordMethod(com.android.tools.r8.graph.DexMethod) -> a
     1:2:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):24:25 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     3:3:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):26 -> a
     4:6:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):27:29 -> a
 com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep -> com.android.tools.r8.A.i:
@@ -13396,7 +13415,7 @@
     150:150:void ensureCodesInited(int):159 -> a
     150:150:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):640 -> a
     151:165:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):641:655 -> a
-    166:166:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    166:166:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     166:166:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):655 -> a
     167:170:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):656:659 -> a
     171:171:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
@@ -13490,168 +13509,171 @@
     352:352:boolean com.android.tools.r8.dex.ClassesChecksum.preceedChecksumMarker(com.android.tools.r8.graph.DexString):82:82 -> a
     352:352:void populateChecksums():952 -> a
     352:352:void populateIndexTables():900 -> a
-    353:353:void populateChecksums():957:957 -> a
+    353:353:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.dex.ClassesChecksum.getChecksums():40:40 -> a
+    353:353:void populateChecksums():957 -> a
     353:353:void populateIndexTables():900 -> a
-    354:355:void populateTypes():933:934 -> a
-    354:355:void populateIndexTables():901 -> a
-    356:358:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):967:969 -> a
-    356:358:void populateTypes():934 -> a
-    356:358:void populateIndexTables():901 -> a
-    359:359:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
-    359:359:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):969 -> a
-    359:359:void populateTypes():934 -> a
-    359:359:void populateIndexTables():901 -> a
-    360:364:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):971:975 -> a
-    360:364:void populateTypes():934 -> a
-    360:364:void populateIndexTables():901 -> a
-    365:365:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
-    365:365:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):975 -> a
-    365:365:void populateTypes():934 -> a
-    365:365:void populateIndexTables():901 -> a
-    366:375:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):977:986 -> a
-    366:375:void populateTypes():934 -> a
-    366:375:void populateIndexTables():901 -> a
-    376:376:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):981:981 -> a
-    376:376:void populateTypes():934 -> a
-    376:376:void populateIndexTables():901 -> a
-    377:379:void populateTypes():935:937 -> a
-    377:379:void populateIndexTables():901 -> a
-    380:386:com.android.tools.r8.graph.DexType typeAt(int):1157:1163 -> a
-    380:386:void populateTypes():937 -> a
-    380:386:void populateIndexTables():901 -> a
-    387:387:void populateTypes():937:937 -> a
-    387:387:void populateIndexTables():901 -> a
-    388:389:void populateFields():995:996 -> a
-    388:389:void populateIndexTables():902 -> a
-    390:392:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1011:1013 -> a
-    390:392:void populateFields():996 -> a
-    390:392:void populateIndexTables():902 -> a
-    393:393:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
-    393:393:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1013 -> a
-    393:393:void populateFields():996 -> a
-    393:393:void populateIndexTables():902 -> a
-    394:400:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1015:1021 -> a
-    394:400:void populateFields():996 -> a
-    394:400:void populateIndexTables():902 -> a
-    401:401:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
-    401:401:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1021 -> a
-    401:401:void populateFields():996 -> a
-    401:401:void populateIndexTables():902 -> a
-    402:425:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1023:1046 -> a
-    402:425:void populateFields():996 -> a
-    402:425:void populateIndexTables():902 -> a
-    426:436:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1043:1053 -> a
-    426:436:void populateFields():996 -> a
-    426:436:void populateIndexTables():902 -> a
-    437:441:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1050:1054 -> a
-    437:441:void populateFields():996 -> a
-    437:441:void populateIndexTables():902 -> a
-    442:442:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1039:1039 -> a
-    442:442:void populateFields():996 -> a
-    442:442:void populateIndexTables():902 -> a
-    443:445:void populateFields():997:999 -> a
-    443:445:void populateIndexTables():902 -> a
-    446:451:com.android.tools.r8.graph.DexField fieldAt(int):1167:1172 -> a
-    446:451:void populateFields():999 -> a
-    446:451:void populateIndexTables():902 -> a
-    452:452:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
-    452:452:com.android.tools.r8.graph.DexField fieldAt(int):1172 -> a
-    452:452:void populateFields():999 -> a
-    452:452:void populateIndexTables():902 -> a
-    453:459:com.android.tools.r8.graph.DexField fieldAt(int):1173:1179 -> a
-    453:459:void populateFields():999 -> a
-    453:459:void populateIndexTables():902 -> a
-    460:460:void populateFields():999:999 -> a
-    460:460:void populateIndexTables():902 -> a
-    461:464:void populateProtos():1065:1068 -> a
-    461:464:void populateIndexTables():903 -> a
-    465:470:com.android.tools.r8.graph.DexProto protoAt(int):1240:1245 -> a
-    465:470:void populateProtos():1068 -> a
-    465:470:void populateIndexTables():903 -> a
-    471:471:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
-    471:471:com.android.tools.r8.graph.DexProto protoAt(int):1245 -> a
-    471:471:void populateProtos():1068 -> a
-    471:471:void populateIndexTables():903 -> a
-    472:478:com.android.tools.r8.graph.DexProto protoAt(int):1246:1252 -> a
-    472:478:void populateProtos():1068 -> a
-    472:478:void populateIndexTables():903 -> a
-    479:479:void populateProtos():1068:1068 -> a
-    479:479:void populateIndexTables():903 -> a
-    480:481:void populateMethods():1073:1074 -> a
-    480:481:void populateIndexTables():904 -> a
-    482:484:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1090:1092 -> a
-    482:484:void populateMethods():1074 -> a
-    482:484:void populateIndexTables():904 -> a
-    485:485:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
-    485:485:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1092 -> a
-    485:485:void populateMethods():1074 -> a
-    485:485:void populateIndexTables():904 -> a
-    486:492:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1094:1100 -> a
-    486:492:void populateMethods():1074 -> a
-    486:492:void populateIndexTables():904 -> a
-    493:493:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
-    493:493:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1100 -> a
-    493:493:void populateMethods():1074 -> a
-    493:493:void populateIndexTables():904 -> a
-    494:517:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1102:1125 -> a
-    494:517:void populateMethods():1074 -> a
-    494:517:void populateIndexTables():904 -> a
-    518:528:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1122:1132 -> a
-    518:528:void populateMethods():1074 -> a
-    518:528:void populateIndexTables():904 -> a
-    529:533:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1129:1133 -> a
-    529:533:void populateMethods():1074 -> a
-    529:533:void populateIndexTables():904 -> a
-    534:534:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1118:1118 -> a
-    534:534:void populateMethods():1074 -> a
-    534:534:void populateIndexTables():904 -> a
-    535:537:void populateMethods():1075:1077 -> a
-    535:537:void populateIndexTables():904 -> a
-    538:543:com.android.tools.r8.graph.DexMethod methodAt(int):1256:1261 -> a
-    538:543:void populateMethods():1077 -> a
-    538:543:void populateIndexTables():904 -> a
-    544:544:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
-    544:544:com.android.tools.r8.graph.DexMethod methodAt(int):1261 -> a
-    544:544:void populateMethods():1077 -> a
-    544:544:void populateIndexTables():904 -> a
-    545:551:com.android.tools.r8.graph.DexMethod methodAt(int):1262:1268 -> a
-    545:551:void populateMethods():1077 -> a
-    545:551:void populateIndexTables():904 -> a
-    552:552:com.android.tools.r8.graph.DexMethod methodAt(int):1265:1265 -> a
-    552:552:void populateMethods():1077 -> a
-    552:552:void populateIndexTables():904 -> a
-    553:553:void populateMethods():1077:1077 -> a
+    354:354:void populateChecksums():957:957 -> a
+    354:354:void populateIndexTables():900 -> a
+    355:356:void populateTypes():933:934 -> a
+    355:356:void populateIndexTables():901 -> a
+    357:359:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):967:969 -> a
+    357:359:void populateTypes():934 -> a
+    357:359:void populateIndexTables():901 -> a
+    360:360:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
+    360:360:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):969 -> a
+    360:360:void populateTypes():934 -> a
+    360:360:void populateIndexTables():901 -> a
+    361:365:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):971:975 -> a
+    361:365:void populateTypes():934 -> a
+    361:365:void populateIndexTables():901 -> a
+    366:366:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
+    366:366:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):975 -> a
+    366:366:void populateTypes():934 -> a
+    366:366:void populateIndexTables():901 -> a
+    367:376:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):977:986 -> a
+    367:376:void populateTypes():934 -> a
+    367:376:void populateIndexTables():901 -> a
+    377:377:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):981:981 -> a
+    377:377:void populateTypes():934 -> a
+    377:377:void populateIndexTables():901 -> a
+    378:380:void populateTypes():935:937 -> a
+    378:380:void populateIndexTables():901 -> a
+    381:387:com.android.tools.r8.graph.DexType typeAt(int):1157:1163 -> a
+    381:387:void populateTypes():937 -> a
+    381:387:void populateIndexTables():901 -> a
+    388:388:void populateTypes():937:937 -> a
+    388:388:void populateIndexTables():901 -> a
+    389:390:void populateFields():995:996 -> a
+    389:390:void populateIndexTables():902 -> a
+    391:393:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1011:1013 -> a
+    391:393:void populateFields():996 -> a
+    391:393:void populateIndexTables():902 -> a
+    394:394:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
+    394:394:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1013 -> a
+    394:394:void populateFields():996 -> a
+    394:394:void populateIndexTables():902 -> a
+    395:401:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1015:1021 -> a
+    395:401:void populateFields():996 -> a
+    395:401:void populateIndexTables():902 -> a
+    402:402:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
+    402:402:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1021 -> a
+    402:402:void populateFields():996 -> a
+    402:402:void populateIndexTables():902 -> a
+    403:426:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1023:1046 -> a
+    403:426:void populateFields():996 -> a
+    403:426:void populateIndexTables():902 -> a
+    427:437:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1043:1053 -> a
+    427:437:void populateFields():996 -> a
+    427:437:void populateIndexTables():902 -> a
+    438:442:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1050:1054 -> a
+    438:442:void populateFields():996 -> a
+    438:442:void populateIndexTables():902 -> a
+    443:443:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1039:1039 -> a
+    443:443:void populateFields():996 -> a
+    443:443:void populateIndexTables():902 -> a
+    444:446:void populateFields():997:999 -> a
+    444:446:void populateIndexTables():902 -> a
+    447:452:com.android.tools.r8.graph.DexField fieldAt(int):1167:1172 -> a
+    447:452:void populateFields():999 -> a
+    447:452:void populateIndexTables():902 -> a
+    453:453:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
+    453:453:com.android.tools.r8.graph.DexField fieldAt(int):1172 -> a
+    453:453:void populateFields():999 -> a
+    453:453:void populateIndexTables():902 -> a
+    454:460:com.android.tools.r8.graph.DexField fieldAt(int):1173:1179 -> a
+    454:460:void populateFields():999 -> a
+    454:460:void populateIndexTables():902 -> a
+    461:461:void populateFields():999:999 -> a
+    461:461:void populateIndexTables():902 -> a
+    462:465:void populateProtos():1065:1068 -> a
+    462:465:void populateIndexTables():903 -> a
+    466:471:com.android.tools.r8.graph.DexProto protoAt(int):1240:1245 -> a
+    466:471:void populateProtos():1068 -> a
+    466:471:void populateIndexTables():903 -> a
+    472:472:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
+    472:472:com.android.tools.r8.graph.DexProto protoAt(int):1245 -> a
+    472:472:void populateProtos():1068 -> a
+    472:472:void populateIndexTables():903 -> a
+    473:479:com.android.tools.r8.graph.DexProto protoAt(int):1246:1252 -> a
+    473:479:void populateProtos():1068 -> a
+    473:479:void populateIndexTables():903 -> a
+    480:480:void populateProtos():1068:1068 -> a
+    480:480:void populateIndexTables():903 -> a
+    481:482:void populateMethods():1073:1074 -> a
+    481:482:void populateIndexTables():904 -> a
+    483:485:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1090:1092 -> a
+    483:485:void populateMethods():1074 -> a
+    483:485:void populateIndexTables():904 -> a
+    486:486:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
+    486:486:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1092 -> a
+    486:486:void populateMethods():1074 -> a
+    486:486:void populateIndexTables():904 -> a
+    487:493:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1094:1100 -> a
+    487:493:void populateMethods():1074 -> a
+    487:493:void populateIndexTables():904 -> a
+    494:494:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
+    494:494:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1100 -> a
+    494:494:void populateMethods():1074 -> a
+    494:494:void populateIndexTables():904 -> a
+    495:518:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1102:1125 -> a
+    495:518:void populateMethods():1074 -> a
+    495:518:void populateIndexTables():904 -> a
+    519:529:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1122:1132 -> a
+    519:529:void populateMethods():1074 -> a
+    519:529:void populateIndexTables():904 -> a
+    530:534:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1129:1133 -> a
+    530:534:void populateMethods():1074 -> a
+    530:534:void populateIndexTables():904 -> a
+    535:535:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1118:1118 -> a
+    535:535:void populateMethods():1074 -> a
+    535:535:void populateIndexTables():904 -> a
+    536:538:void populateMethods():1075:1077 -> a
+    536:538:void populateIndexTables():904 -> a
+    539:544:com.android.tools.r8.graph.DexMethod methodAt(int):1256:1261 -> a
+    539:544:void populateMethods():1077 -> a
+    539:544:void populateIndexTables():904 -> a
+    545:545:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
+    545:545:com.android.tools.r8.graph.DexMethod methodAt(int):1261 -> a
+    545:545:void populateMethods():1077 -> a
+    545:545:void populateIndexTables():904 -> a
+    546:552:com.android.tools.r8.graph.DexMethod methodAt(int):1262:1268 -> a
+    546:552:void populateMethods():1077 -> a
+    546:552:void populateIndexTables():904 -> a
+    553:553:com.android.tools.r8.graph.DexMethod methodAt(int):1265:1265 -> a
+    553:553:void populateMethods():1077 -> a
     553:553:void populateIndexTables():904 -> a
-    554:557:void populateMethodHandles():917:920 -> a
-    554:557:void populateIndexTables():905 -> a
-    558:563:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1183:1188 -> a
-    558:563:void populateMethodHandles():920 -> a
-    558:563:void populateIndexTables():905 -> a
-    564:564:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
-    564:564:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1188 -> a
-    564:564:void populateMethodHandles():920 -> a
-    564:564:void populateIndexTables():905 -> a
-    565:586:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1189:1210 -> a
-    565:586:void populateMethodHandles():920 -> a
-    565:586:void populateIndexTables():905 -> a
-    587:587:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1206:1206 -> a
-    587:587:void populateMethodHandles():920 -> a
-    587:587:void populateIndexTables():905 -> a
-    588:604:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1198:1214 -> a
-    588:604:void populateMethodHandles():920 -> a
-    588:604:void populateIndexTables():905 -> a
-    605:605:void populateMethodHandles():920:920 -> a
-    605:605:void populateIndexTables():905 -> a
-    606:609:void populateCallSites():925:928 -> a
-    606:609:void populateIndexTables():906 -> a
-    610:627:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1219:1236 -> a
-    610:627:void populateCallSites():928 -> a
-    610:627:void populateIndexTables():906 -> a
-    628:628:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1231:1231 -> a
-    628:628:void populateCallSites():928 -> a
-    628:628:void populateIndexTables():906 -> a
-    629:629:void populateCallSites():928:928 -> a
+    554:554:void populateMethods():1077:1077 -> a
+    554:554:void populateIndexTables():904 -> a
+    555:558:void populateMethodHandles():917:920 -> a
+    555:558:void populateIndexTables():905 -> a
+    559:564:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1183:1188 -> a
+    559:564:void populateMethodHandles():920 -> a
+    559:564:void populateIndexTables():905 -> a
+    565:565:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
+    565:565:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1188 -> a
+    565:565:void populateMethodHandles():920 -> a
+    565:565:void populateIndexTables():905 -> a
+    566:587:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1189:1210 -> a
+    566:587:void populateMethodHandles():920 -> a
+    566:587:void populateIndexTables():905 -> a
+    588:588:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1206:1206 -> a
+    588:588:void populateMethodHandles():920 -> a
+    588:588:void populateIndexTables():905 -> a
+    589:605:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1198:1214 -> a
+    589:605:void populateMethodHandles():920 -> a
+    589:605:void populateIndexTables():905 -> a
+    606:606:void populateMethodHandles():920:920 -> a
+    606:606:void populateIndexTables():905 -> a
+    607:610:void populateCallSites():925:928 -> a
+    607:610:void populateIndexTables():906 -> a
+    611:628:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1219:1236 -> a
+    611:628:void populateCallSites():928 -> a
+    611:628:void populateIndexTables():906 -> a
+    629:629:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1231:1231 -> a
+    629:629:void populateCallSites():928 -> a
     629:629:void populateIndexTables():906 -> a
+    630:630:void populateCallSites():928:928 -> a
+    630:630:void populateIndexTables():906 -> a
     1:2:com.android.tools.r8.graph.DexAnnotation parseAnnotation():424:425 -> b
     3:3:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> b
     3:3:com.android.tools.r8.graph.DexAnnotation parseAnnotation():425 -> b
@@ -13945,139 +13967,145 @@
     7:7:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):121:121 -> a
     8:8:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
     8:8:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):121 -> a
-    9:11:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):122:124 -> a
-    12:12:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    12:12:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):124 -> a
-    13:13:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):125:125 -> a
+    9:9:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):122:122 -> a
+    10:10:boolean com.android.tools.r8.graph.PresortedComparable.isSorted(java.lang.Object[],java.util.function.Function):19:19 -> a
+    10:10:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):122 -> a
+    11:13:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):122:124 -> a
     14:14:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    14:14:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):120 -> a
-    15:15:com.android.tools.r8.graph.DexString lambda$writeEncodedAnnotation$0(com.android.tools.r8.graph.DexAnnotationElement):122:122 -> a
-    16:36:com.android.tools.r8.dex.FileWriter collect():131:151 -> a
-    37:74:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):256:293 -> a
-    75:75:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    75:75:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):293 -> a
-    76:76:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):293:293 -> a
-    77:78:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):269:270 -> a
-    79:79:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    79:79:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):270 -> a
-    80:80:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):270:270 -> a
-    81:86:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):324:329 -> a
-    87:90:void addSignaturesFromMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,java.util.Map,com.android.tools.r8.naming.ClassNameMapper):345:348 -> a
-    87:90:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):328 -> a
-    91:91:com.android.tools.r8.naming.MemberNaming$MethodSignature com.android.tools.r8.naming.MemberNaming$MethodSignature.fromDexMethod(com.android.tools.r8.graph.DexMethod):225:225 -> a
-    91:91:void addSignaturesFromMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,java.util.Map,com.android.tools.r8.naming.ClassNameMapper):348 -> a
-    91:91:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):328 -> a
-    92:94:void addSignaturesFromMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,java.util.Map,com.android.tools.r8.naming.ClassNameMapper):349:351 -> a
-    92:94:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):328 -> a
-    95:97:void writeFixedSectionItems(java.util.Collection,int,java.util.function.Consumer):356:358 -> a
-    98:102:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer,int):377:381 -> a
-    103:104:void writeTypeItem(com.android.tools.r8.graph.DexType):430:431 -> a
-    105:107:void writeProtoItem(com.android.tools.r8.graph.DexProto):435:437 -> a
-    108:115:void writeFieldItem(com.android.tools.r8.graph.DexField):441:448 -> a
-    116:123:void writeMethodItem(com.android.tools.r8.graph.DexMethod):452:459 -> a
-    124:125:void writeDebugItem(com.android.tools.r8.graph.DexDebugInfo):477:478 -> a
-    126:140:void writeCodeItem(com.android.tools.r8.graph.DexCode):482:496 -> a
-    141:141:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    141:141:void writeCodeItem(com.android.tools.r8.graph.DexCode):496 -> a
-    142:150:void writeCodeItem(com.android.tools.r8.graph.DexCode):497:505 -> a
-    151:151:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    151:151:void writeCodeItem(com.android.tools.r8.graph.DexCode):505 -> a
-    152:157:void writeCodeItem(com.android.tools.r8.graph.DexCode):506:511 -> a
-    158:158:void com.android.tools.r8.dex.DexOutputBuffer.putSleb128(int):84:84 -> a
-    158:158:void writeCodeItem(com.android.tools.r8.graph.DexCode):511 -> a
-    159:160:void writeCodeItem(com.android.tools.r8.graph.DexCode):512:513 -> a
-    161:161:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    161:161:void writeCodeItem(com.android.tools.r8.graph.DexCode):513 -> a
-    162:162:void writeCodeItem(com.android.tools.r8.graph.DexCode):514:514 -> a
+    14:14:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):124 -> a
+    15:15:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):125:125 -> a
+    16:16:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    16:16:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):120 -> a
+    17:17:com.android.tools.r8.graph.DexString lambda$writeEncodedAnnotation$0(com.android.tools.r8.graph.DexAnnotationElement):122:122 -> a
+    18:38:com.android.tools.r8.dex.FileWriter collect():131:151 -> a
+    39:76:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):256:293 -> a
+    77:77:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    77:77:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):293 -> a
+    78:78:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):293:293 -> a
+    79:80:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):269:270 -> a
+    81:81:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    81:81:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):270 -> a
+    82:82:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):270:270 -> a
+    83:88:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):324:329 -> a
+    89:92:void addSignaturesFromMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,java.util.Map,com.android.tools.r8.naming.ClassNameMapper):345:348 -> a
+    89:92:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):328 -> a
+    93:93:com.android.tools.r8.naming.MemberNaming$MethodSignature com.android.tools.r8.naming.MemberNaming$MethodSignature.fromDexMethod(com.android.tools.r8.graph.DexMethod):225:225 -> a
+    93:93:void addSignaturesFromMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,java.util.Map,com.android.tools.r8.naming.ClassNameMapper):348 -> a
+    93:93:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):328 -> a
+    94:96:void addSignaturesFromMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,java.util.Map,com.android.tools.r8.naming.ClassNameMapper):349:351 -> a
+    94:96:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):328 -> a
+    97:99:void writeFixedSectionItems(java.util.Collection,int,java.util.function.Consumer):356:358 -> a
+    100:104:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer,int):377:381 -> a
+    105:106:void writeTypeItem(com.android.tools.r8.graph.DexType):430:431 -> a
+    107:109:void writeProtoItem(com.android.tools.r8.graph.DexProto):435:437 -> a
+    110:117:void writeFieldItem(com.android.tools.r8.graph.DexField):441:448 -> a
+    118:125:void writeMethodItem(com.android.tools.r8.graph.DexMethod):452:459 -> a
+    126:127:void writeDebugItem(com.android.tools.r8.graph.DexDebugInfo):477:478 -> a
+    128:142:void writeCodeItem(com.android.tools.r8.graph.DexCode):482:496 -> a
+    143:143:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
+    143:143:void writeCodeItem(com.android.tools.r8.graph.DexCode):496 -> a
+    144:152:void writeCodeItem(com.android.tools.r8.graph.DexCode):497:505 -> a
+    153:153:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    153:153:void writeCodeItem(com.android.tools.r8.graph.DexCode):505 -> a
+    154:159:void writeCodeItem(com.android.tools.r8.graph.DexCode):506:511 -> a
+    160:160:void com.android.tools.r8.dex.DexOutputBuffer.putSleb128(int):84:84 -> a
+    160:160:void writeCodeItem(com.android.tools.r8.graph.DexCode):511 -> a
+    161:162:void writeCodeItem(com.android.tools.r8.graph.DexCode):512:513 -> a
     163:163:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    163:163:void writeCodeItem(com.android.tools.r8.graph.DexCode):514 -> a
-    164:164:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    164:164:void writeCodeItem(com.android.tools.r8.graph.DexCode):513 -> a
-    165:165:void writeCodeItem(com.android.tools.r8.graph.DexCode):517:517 -> a
+    163:163:void writeCodeItem(com.android.tools.r8.graph.DexCode):513 -> a
+    164:164:void writeCodeItem(com.android.tools.r8.graph.DexCode):514:514 -> a
+    165:165:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    165:165:void writeCodeItem(com.android.tools.r8.graph.DexCode):514 -> a
     166:166:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    166:166:void writeCodeItem(com.android.tools.r8.graph.DexCode):517 -> a
-    167:167:void com.android.tools.r8.dex.DexOutputBuffer.putSleb128(int):84:84 -> a
-    167:167:void writeCodeItem(com.android.tools.r8.graph.DexCode):511 -> a
-    168:177:void writeCodeItem(com.android.tools.r8.graph.DexCode):520:529 -> a
-    178:178:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    178:178:void writeCodeItem(com.android.tools.r8.graph.DexCode):505 -> a
-    179:184:void writeTypeList(com.android.tools.r8.graph.DexTypeList):534:539 -> a
-    185:186:void writeStringData(com.android.tools.r8.graph.DexString):544:545 -> a
-    187:187:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    187:187:void writeStringData(com.android.tools.r8.graph.DexString):545 -> a
-    188:188:void writeStringData(com.android.tools.r8.graph.DexString):546:546 -> a
+    166:166:void writeCodeItem(com.android.tools.r8.graph.DexCode):513 -> a
+    167:167:void writeCodeItem(com.android.tools.r8.graph.DexCode):517:517 -> a
+    168:168:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    168:168:void writeCodeItem(com.android.tools.r8.graph.DexCode):517 -> a
+    169:169:void com.android.tools.r8.dex.DexOutputBuffer.putSleb128(int):84:84 -> a
+    169:169:void writeCodeItem(com.android.tools.r8.graph.DexCode):511 -> a
+    170:179:void writeCodeItem(com.android.tools.r8.graph.DexCode):520:529 -> a
+    180:180:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    180:180:void writeCodeItem(com.android.tools.r8.graph.DexCode):505 -> a
+    181:186:void writeTypeList(com.android.tools.r8.graph.DexTypeList):534:539 -> a
+    187:188:void writeStringData(com.android.tools.r8.graph.DexString):544:545 -> a
     189:189:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
     189:189:void writeStringData(com.android.tools.r8.graph.DexString):545 -> a
-    190:190:com.android.tools.r8.graph.DexType lambda$writeAnnotationSet$2(com.android.tools.r8.graph.DexAnnotation):559:559 -> a
-    191:191:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):559:559 -> a
-    192:192:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    192:192:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):560 -> a
-    193:196:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):560:563 -> a
-    197:197:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    197:197:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):563 -> a
-    198:200:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):565:567 -> a
-    201:210:void writeAnnotationSetRefList(com.android.tools.r8.graph.ParameterAnnotationsList):572:581 -> a
-    211:213:void writeMemberAnnotations(java.util.List,java.util.function.ToIntFunction):587:589 -> a
-    214:226:void writeAnnotationDirectory(com.android.tools.r8.graph.DexAnnotationDirectory):594:606 -> a
-    227:227:int lambda$writeAnnotationDirectory$3(com.android.tools.r8.graph.DexEncodedField):603:603 -> a
-    228:233:void writeEncodedFields(java.util.List):611:616 -> a
-    234:234:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    234:234:void writeEncodedFields(java.util.List):616 -> a
-    235:235:void writeEncodedFields(java.util.List):618:618 -> a
-    236:236:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    236:236:void writeEncodedFields(java.util.List):618 -> a
-    237:237:void writeEncodedFields(java.util.List):619:619 -> a
+    190:190:void writeStringData(com.android.tools.r8.graph.DexString):546:546 -> a
+    191:191:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    191:191:void writeStringData(com.android.tools.r8.graph.DexString):545 -> a
+    192:192:com.android.tools.r8.graph.DexType lambda$writeAnnotationSet$2(com.android.tools.r8.graph.DexAnnotation):559:559 -> a
+    193:193:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):559:559 -> a
+    194:194:boolean com.android.tools.r8.graph.PresortedComparable.isSorted(java.lang.Object[],java.util.function.Function):19:19 -> a
+    194:194:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):559 -> a
+    195:195:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):559:559 -> a
+    196:196:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
+    196:196:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):560 -> a
+    197:200:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):560:563 -> a
+    201:201:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    201:201:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):563 -> a
+    202:204:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):565:567 -> a
+    205:214:void writeAnnotationSetRefList(com.android.tools.r8.graph.ParameterAnnotationsList):572:581 -> a
+    215:217:void writeMemberAnnotations(java.util.List,java.util.function.ToIntFunction):587:589 -> a
+    218:230:void writeAnnotationDirectory(com.android.tools.r8.graph.DexAnnotationDirectory):594:606 -> a
+    231:231:int lambda$writeAnnotationDirectory$3(com.android.tools.r8.graph.DexEncodedField):603:603 -> a
+    232:237:void writeEncodedFields(java.util.List):611:616 -> a
     238:238:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    238:238:void writeEncodedFields(java.util.List):618 -> a
-    239:239:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    239:239:void writeEncodedFields(java.util.List):616 -> a
-    240:245:void writeEncodedMethods(java.util.List,boolean):624:629 -> a
-    246:246:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    246:246:void writeEncodedMethods(java.util.List,boolean):629 -> a
-    247:247:void writeEncodedMethods(java.util.List,boolean):631:631 -> a
-    248:248:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    248:248:void writeEncodedMethods(java.util.List,boolean):631 -> a
-    249:253:void writeEncodedMethods(java.util.List,boolean):632:636 -> a
-    254:254:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    254:254:void writeEncodedMethods(java.util.List,boolean):636 -> a
-    255:255:void writeEncodedMethods(java.util.List,boolean):638:638 -> a
-    256:256:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    256:256:void writeEncodedMethods(java.util.List,boolean):638 -> a
-    257:257:void writeEncodedMethods(java.util.List,boolean):641:641 -> a
+    238:238:void writeEncodedFields(java.util.List):616 -> a
+    239:239:void writeEncodedFields(java.util.List):618:618 -> a
+    240:240:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    240:240:void writeEncodedFields(java.util.List):618 -> a
+    241:241:void writeEncodedFields(java.util.List):619:619 -> a
+    242:242:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    242:242:void writeEncodedFields(java.util.List):618 -> a
+    243:243:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    243:243:void writeEncodedFields(java.util.List):616 -> a
+    244:249:void writeEncodedMethods(java.util.List,boolean):624:629 -> a
+    250:250:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    250:250:void writeEncodedMethods(java.util.List,boolean):629 -> a
+    251:251:void writeEncodedMethods(java.util.List,boolean):631:631 -> a
+    252:252:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    252:252:void writeEncodedMethods(java.util.List,boolean):631 -> a
+    253:257:void writeEncodedMethods(java.util.List,boolean):632:636 -> a
     258:258:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    258:258:void writeEncodedMethods(java.util.List,boolean):638 -> a
-    259:259:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    259:259:void writeEncodedMethods(java.util.List,boolean):631 -> a
+    258:258:void writeEncodedMethods(java.util.List,boolean):636 -> a
+    259:259:void writeEncodedMethods(java.util.List,boolean):638:638 -> a
     260:260:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    260:260:void writeEncodedMethods(java.util.List,boolean):629 -> a
-    261:267:void addStaticFieldValues(com.android.tools.r8.graph.DexProgramClass):665:671 -> a
-    268:270:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):708:710 -> a
-    271:271:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    271:271:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):710 -> a
-    272:272:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):712:712 -> a
-    273:273:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    273:273:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):712 -> a
-    274:275:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):713:714 -> a
-    276:276:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    276:276:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):712 -> a
-    277:283:int writeMapItem(int,int,int):722:728 -> a
-    284:284:void checkThatInvokeCustomIsAllowed():1370:1370 -> a
-    284:284:void writeCallSite(com.android.tools.r8.graph.DexCallSite):702 -> a
-    285:286:void writeCallSite(com.android.tools.r8.graph.DexCallSite):703:704 -> a
-    287:287:void checkThatInvokeCustomIsAllowed():1371:1371 -> a
-    287:287:void writeCallSite(com.android.tools.r8.graph.DexCallSite):702 -> a
+    260:260:void writeEncodedMethods(java.util.List,boolean):638 -> a
+    261:261:void writeEncodedMethods(java.util.List,boolean):641:641 -> a
+    262:262:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    262:262:void writeEncodedMethods(java.util.List,boolean):638 -> a
+    263:263:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    263:263:void writeEncodedMethods(java.util.List,boolean):631 -> a
+    264:264:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    264:264:void writeEncodedMethods(java.util.List,boolean):629 -> a
+    265:271:void addStaticFieldValues(com.android.tools.r8.graph.DexProgramClass):665:671 -> a
+    272:274:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):708:710 -> 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 writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):710 -> a
+    276:276:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):712:712 -> a
+    277:277:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    277:277:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):712 -> a
+    278:279:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):713:714 -> a
+    280:280:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    280:280:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):712 -> a
+    281:287:int writeMapItem(int,int,int):722:728 -> a
     288:288:void checkThatInvokeCustomIsAllowed():1370:1370 -> a
-    288:288:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):676 -> a
-    289:294:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):678:683 -> a
-    295:303:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):680:688 -> a
-    304:304:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
-    304:304:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):690 -> a
-    305:307:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):691:693 -> a
-    308:308:boolean com.android.tools.r8.graph.DexMethodHandle.isFieldHandle():293:293 -> a
-    308:308:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):693 -> a
-    309:314:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):693:698 -> a
-    315:315:void checkThatInvokeCustomIsAllowed():1371:1371 -> a
-    315:315:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):676 -> a
+    288:288:void writeCallSite(com.android.tools.r8.graph.DexCallSite):702 -> a
+    289:290:void writeCallSite(com.android.tools.r8.graph.DexCallSite):703:704 -> a
+    291:291:void checkThatInvokeCustomIsAllowed():1371:1371 -> a
+    291:291:void writeCallSite(com.android.tools.r8.graph.DexCallSite):702 -> a
+    292:292:void checkThatInvokeCustomIsAllowed():1370:1370 -> a
+    292:292:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):676 -> a
+    293:298:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):678:683 -> a
+    299:307:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):680:688 -> a
+    308:308:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
+    308:308:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):690 -> a
+    309:311:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):691:693 -> a
+    312:312:boolean com.android.tools.r8.graph.DexMethodHandle.isFieldHandle():293:293 -> a
+    312:312:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):693 -> a
+    313:318:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):693:698 -> a
+    319:319:void checkThatInvokeCustomIsAllowed():1371:1371 -> a
+    319:319:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):676 -> a
     1:7:void checkInterfaceMethods():237:243 -> b
     1:7:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():158 -> b
     8:8:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():161:161 -> b
@@ -14177,7 +14205,7 @@
     246:249:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):834:837 -> b
     246:249:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():224 -> b
     250:251:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():227:228 -> b
-    252:252:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> b
+    252:252:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> b
     252:252:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():228 -> b
     253:258:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():228:233 -> b
     259:259:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):828:828 -> b
@@ -15104,7 +15132,10 @@
     19:19:void parseDexFiles():53:53 -> b
     20:20:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
     20:20:void parseDexFiles():53 -> b
-    21:21:void parseDexFiles():53:53 -> b
+    21:21:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> b
+    21:21:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> b
+    21:21:void parseDexFiles():53 -> b
+    22:22:void parseDexFiles():53:53 -> b
 com.android.tools.r8.dex.VDexReader -> com.android.tools.r8.A.X:
     boolean $assertionsDisabled -> e
     int version -> d
@@ -15130,7 +15161,10 @@
     1:13:void setByteOrder():75:87 -> g
     14:14:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> g
     14:14:void setByteOrder():87 -> g
-    15:15:void setByteOrder():87:87 -> g
+    15:15:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> g
+    15:15:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> g
+    15:15:void setByteOrder():87 -> g
+    16:16:void setByteOrder():87:87 -> g
 com.android.tools.r8.dex.VirtualFile -> com.android.tools.r8.A.j0:
     com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection indexedItems -> b
     boolean $assertionsDisabled -> f
@@ -15852,102 +15886,103 @@
     java.util.concurrent.ConcurrentHashMap definitions -> c
     boolean obsolete -> e
     boolean $assertionsDisabled -> f
-    1:1:void <clinit>():21:21 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication):35:35 -> <init>
-    2:14:void <init>(com.android.tools.r8.graph.DexApplication):25:37 -> <init>
-    15:15:void <init>(com.android.tools.r8.graph.AppInfo):40:40 -> <init>
-    16:36:void <init>(com.android.tools.r8.graph.AppInfo):25:45 -> <init>
-    1:1:void copyMetadataFromPrevious(com.android.tools.r8.graph.AppInfo):49:49 -> a
-    2:3:com.android.tools.r8.graph.DexItemFactory dexItemFactory():76:77 -> a
-    4:7:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):81:84 -> a
-    8:8:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getKey():95:95 -> a
-    8:8:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):97 -> a
-    9:9:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):97:97 -> a
-    10:16:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):127:133 -> a
-    17:22:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):149:154 -> a
-    23:24:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):161:162 -> a
-    25:29:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):247:251 -> a
-    30:32:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):277:279 -> a
-    33:36:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,boolean):294:297 -> 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:64:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):512:515 -> a
+    1:1:void <clinit>():22:22 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication):36:36 -> <init>
+    2:14:void <init>(com.android.tools.r8.graph.DexApplication):26:38 -> <init>
+    15:15:void <init>(com.android.tools.r8.graph.AppInfo):41:41 -> <init>
+    16:36:void <init>(com.android.tools.r8.graph.AppInfo):26:46 -> <init>
+    1:1:void copyMetadataFromPrevious(com.android.tools.r8.graph.AppInfo):54:54 -> a
+    2:3:com.android.tools.r8.graph.DexItemFactory dexItemFactory():81:82 -> a
+    4:7:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):86:89 -> a
+    8:8:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getKey():94:94 -> a
+    8:8:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):102 -> a
+    9:9:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):102:102 -> a
+    10:16:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):132:138 -> a
+    17:22:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):154:159 -> a
+    23:24:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):166:167 -> a
+    25:29:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):252:256 -> a
+    30:32:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):282:284 -> a
+    33:36:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,boolean):299:302 -> 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):430:453 -> a
+    61:64:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):517:520 -> a
     65:65:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
-    65:65:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):515 -> a
-    66:66:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):608:608 -> a
+    65:65:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):520 -> a
+    66:66:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):613:613 -> a
     67:67:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> a
-    67:67:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):608 -> a
-    68:69:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):608:609 -> a
+    67:67:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):613 -> a
+    68:69:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):613:614 -> a
     70:70:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
-    70:70:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):609 -> a
-    71:74:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):609:612 -> a
+    70:70:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):614 -> a
+    71:74:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):614:617 -> a
     75:75:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> a
-    75:75:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):612 -> a
-    76:76:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):612:612 -> a
+    75:75:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):617 -> a
+    76:76:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):617:617 -> a
     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():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
-    3:6:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod):234:237 -> b
-    7:13:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):265:271 -> b
-    14:16:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):277:279 -> b
-    14:16:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):273 -> b
-    17:20:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):345:348 -> b
-    21:29:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):404:412 -> b
-    21:29:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):353 -> b
-    30:33:com.android.tools.r8.graph.DexEncodedField lookupStaticTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):525:528 -> b
+    77:77:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):617 -> a
+    78:78:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):645:645 -> a
+    79:79:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> a
+    79:79:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):101 -> a
+    80:80:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):101:101 -> a
+    1:2:com.android.tools.r8.graph.DexApplication app():75:76 -> b
+    3:6:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod):239:242 -> b
+    7:13:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):270:276 -> b
+    14:16:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):282:284 -> b
+    14:16:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):278 -> b
+    17:20:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):350:353 -> b
+    21:29:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):409:417 -> b
+    21:29:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):358 -> b
+    30:33:com.android.tools.r8.graph.DexEncodedField lookupStaticTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):530:533 -> b
     34:34:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> b
-    34:34:com.android.tools.r8.graph.DexEncodedField lookupStaticTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):528 -> b
-    35:36:com.android.tools.r8.graph.DexEncodedField resolveField(com.android.tools.r8.graph.DexField):536:537 -> b
-    37:38:boolean isInMainDexList(com.android.tools.r8.graph.DexType):644:645 -> b
-    1:1:boolean checkIfObsolete():65:65 -> c
-    2:2:boolean isObsolete():53:53 -> c
-    2:2:boolean checkIfObsolete():65 -> c
-    3:3:boolean checkIfObsolete():65:65 -> c
-    4:6:com.android.tools.r8.origin.Origin originFor(com.android.tools.r8.graph.DexType):142:144 -> c
-    7:10:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod):186:189 -> c
-    11:23:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):329:341 -> c
-    24:37:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):484:497 -> c
+    34:34:com.android.tools.r8.graph.DexEncodedField lookupStaticTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):533 -> b
+    35:36:com.android.tools.r8.graph.DexEncodedField resolveField(com.android.tools.r8.graph.DexField):541:542 -> b
+    37:38:boolean isInMainDexList(com.android.tools.r8.graph.DexType):649:650 -> b
+    1:1:boolean checkIfObsolete():70:70 -> c
+    2:2:boolean isObsolete():58:58 -> c
+    2:2:boolean checkIfObsolete():70 -> c
+    3:3:boolean checkIfObsolete():70:70 -> c
+    4:6:com.android.tools.r8.origin.Origin originFor(com.android.tools.r8.graph.DexType):147:149 -> c
+    7:10:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod):191:194 -> c
+    11:23:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):334:346 -> c
+    24:37:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):489:502 -> c
     38:38:boolean com.android.tools.r8.graph.AccessFlags.isPublic():128:128 -> c
-    38:38:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):497 -> c
-    39:39:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):497:497 -> c
+    38:38:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):502 -> c
+    39:39:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):502:502 -> c
     40:40:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> c
-    40:40:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):497 -> c
-    41:49:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):404:412 -> c
-    41:49:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):502 -> c
-    50:69:com.android.tools.r8.graph.DexEncodedField resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):547:566 -> c
-    1:7:java.util.Map computeDefinitions(com.android.tools.r8.graph.DexType):93:99 -> d
-    8:9:java.lang.Iterable classes():103:104 -> d
-    10:12:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):367:369 -> d
-    13:20:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):368:375 -> d
+    40:40:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):502 -> c
+    41:49:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):409:417 -> c
+    41:49:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):507 -> c
+    50:69:com.android.tools.r8.graph.DexEncodedField resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):552:571 -> c
+    1:7:java.util.Map computeDefinitions(com.android.tools.r8.graph.DexType):98:104 -> d
+    8:9:java.lang.Iterable classes():108:109 -> d
+    10:12:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):372:374 -> d
+    13:20:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):373:380 -> d
     21:21:boolean com.android.tools.r8.graph.MethodAccessFlags.isNative():142:142 -> d
-    21:21:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):375 -> d
-    22:22:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):375:375 -> d
+    21:21:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):380 -> d
+    22:22:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):380:380 -> d
     23:23:boolean com.android.tools.r8.graph.MethodAccessFlags.isVarargs():134:134 -> d
-    23:23:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):375 -> d
-    24:32:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):380:388 -> d
-    33:47:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):466:480 -> d
-    1:2:java.lang.Iterable classesWithDeterministicOrder():108:109 -> e
-    3:9:java.util.Map getDefinitions(com.android.tools.r8.graph.DexType):166:172 -> e
-    10:15:com.android.tools.r8.graph.ResolutionResult resolveMethodOnArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):308:313 -> e
-    1:2:java.util.Collection getSynthesizedClassesForSanityCheck():88:89 -> f
-    1:1:boolean hasLiveness():629:629 -> g
-    1:1:boolean hasSubtyping():619:619 -> h
-    1:1:boolean isObsolete():53:53 -> i
-    1:1:void markObsolete():57:57 -> j
-    1:1:void unsetObsolete():61:61 -> k
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():634:634 -> l
-    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():624:624 -> m
+    23:23:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):380 -> d
+    24:32:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):385:393 -> d
+    33:47:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):471:485 -> d
+    1:2:java.lang.Iterable classesWithDeterministicOrder():113:114 -> e
+    3:9:java.util.Map getDefinitions(com.android.tools.r8.graph.DexType):171:177 -> e
+    10:15:com.android.tools.r8.graph.ResolutionResult resolveMethodOnArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):313:318 -> e
+    1:2:java.util.Collection getSynthesizedClassesForSanityCheck():93:94 -> f
+    1:1:boolean hasLiveness():634:634 -> g
+    1:1:boolean hasSubtyping():624:624 -> h
+    1:1:boolean isObsolete():58:58 -> i
+    1:1:void markObsolete():62:62 -> j
+    1:1:com.android.tools.r8.utils.InternalOptions options():50:50 -> k
+    1:1:void unsetObsolete():66:66 -> l
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():639:639 -> m
+    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():629:629 -> n
 com.android.tools.r8.graph.AppInfo$1 -> com.android.tools.r8.C.b:
 com.android.tools.r8.graph.AppInfo$MultiResultBuilder -> com.android.tools.r8.C.c:
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder builder -> a
     com.android.tools.r8.graph.DexEncodedMethod singleResult -> b
-    1:1:void <init>():648:648 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppInfo$1):648:648 -> <init>
-    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
+    1:1:void <init>():653:653 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppInfo$1):653:653 -> <init>
+    1:8:void add(com.android.tools.r8.graph.DexEncodedMethod):659:666 -> a
+    9:12:com.android.tools.r8.graph.ResolutionResult build():671:674 -> a
 com.android.tools.r8.graph.AppInfoWithSubtyping -> com.android.tools.r8.C.f:
     boolean $assertionsDisabled -> m
     java.util.Set missingClasses -> g
@@ -15966,79 +16001,79 @@
     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):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):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):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):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):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
+    91:95:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):325:329 -> a
+    96:96:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
+    96:96:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):330 -> a
+    97:97:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):330:330 -> a
+    98:98:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    98:98:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):330 -> a
+    99:99:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):330:330 -> a
+    100:119:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppInfo.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):208:227 -> a
+    100:119:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):332 -> a
+    120:126:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):354:360 -> a
+    127:127:boolean com.android.tools.r8.graph.DexMethod.hasSameProtoAndName(com.android.tools.r8.graph.DexMethod):103:103 -> a
+    127:127:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):360 -> a
+    128:134:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):360:366 -> a
+    135:145:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):388:398 -> a
+    146:146:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():102:102 -> a
+    146:146:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):398 -> a
+    147:156:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):409:418 -> a
+    157:157:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> a
+    157:157:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):418 -> a
+    158:161:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):419:422 -> a
+    162:162:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):391:391 -> a
+    163:166:boolean isStringConcat(com.android.tools.r8.graph.DexMethodHandle):429:432 -> a
+    167:169:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):437:439 -> a
+    170:185:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):501:516 -> a
+    186:195:boolean isSubtypeOfClass(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,boolean):537:546 -> a
+    196:208:void implementedInterfaces(com.android.tools.r8.graph.DexType,java.util.Set):622:634 -> a
+    209:229:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):723:743 -> a
+    230:230:java.util.Set allImmediateSubtypes(com.android.tools.r8.graph.DexType):455:455 -> a
+    230:230:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):748 -> a
+    231:237:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):748:754 -> a
     1:4:void populateSuperType(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):205:208 -> b
-    5:53:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):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:53:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):660:708 -> b
+    1:1:boolean inDifferentHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):714:714 -> c
+    1:4:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):484:487 -> d
     5:7:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):175:177 -> d
-    5:7:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):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 isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):488 -> d
+    8:16:java.lang.Iterable allImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType):561:569 -> d
+    1:4:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):473:476 -> e
     5:7:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):175:177 -> e
-    5:7:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):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
+    5:7:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):477 -> e
+    8:12:java.lang.Iterable allImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType):585:589 -> e
+    1:1:java.util.Set allImmediateSubtypes(com.android.tools.r8.graph.DexType):455:455 -> f
+    2:11:boolean isInterfaceSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):520:529 -> f
+    1:1:boolean lambda$isStrictSubtypeOf$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):514:514 -> g
+    2:5:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):639:642 -> g
     6:6:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809:809 -> g
-    6:6:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):643 -> g
+    6:6:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):642 -> g
     7:7:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getNext(java.util.Iterator,java.lang.Object):888:888 -> g
     7:7:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809 -> g
-    7:7:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):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
+    7:7:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):642 -> g
+    8:8:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):642:642 -> g
+    1:1:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):336:336 -> h
+    2:2:boolean hasSubtyping():444:444 -> h
+    1:1:boolean hasSubtypes(com.android.tools.r8.graph.DexType):468:468 -> i
+    1:12:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):607:618 -> j
+    13:13:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):617:617 -> j
+    1:1:boolean isMarkedAsInterface(com.android.tools.r8.graph.DexType):463:463 -> k
+    1:1:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):593:593 -> l
     2:6:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithSubtyping):697:701 -> l
-    2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):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: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
+    2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):594 -> l
+    1:1:boolean isSerializable(com.android.tools.r8.graph.DexType):602:602 -> m
+    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():450:450 -> n
+    2:2:boolean isUnknown(com.android.tools.r8.graph.DexType):459:459 -> n
+    3:3:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():102:102 -> n
+    3:3:boolean isUnknown(com.android.tools.r8.graph.DexType):459 -> n
+    1:2:java.util.Set getMissingClasses():191:192 -> o
+    3:3:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):718:718 -> o
+    1:1:java.util.Set access$000():27:27 -> p
+    2:5:java.util.Set subtypes(com.android.tools.r8.graph.DexType):196:199 -> p
     1:1:com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo getTypeInfo(com.android.tools.r8.graph.DexType):214:214 -> q
-    1:1:boolean lambda$allImmediateExtendsSubtypes$2(com.android.tools.r8.graph.DexType):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:boolean lambda$allImmediateExtendsSubtypes$2(com.android.tools.r8.graph.DexType):564:564 -> r
+    1:1:boolean lambda$allImmediateExtendsSubtypes$3(com.android.tools.r8.graph.DexType):567:567 -> s
+    1:1:boolean lambda$allImmediateImplementsSubtypes$4(com.android.tools.r8.graph.DexType):587:587 -> t
     1:1:java.util.Set lambda$populateSuperType$0(com.android.tools.r8.graph.DexType):205:205 -> u
 com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo -> com.android.tools.r8.C.e:
     java.util.Set directSubtypes -> c
@@ -16104,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):1220:1220 -> visit
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> visit
     7:7:void visit(com.android.tools.r8.DataEntryResource):162 -> visit
     8:13:void visit(com.android.tools.r8.DataEntryResource):163:168 -> visit
     14:19:void visit(com.android.tools.r8.DataEntryResource):167:172 -> visit
@@ -16145,9 +16180,9 @@
     7:7:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
     8:8:com.android.tools.r8.graph.AppInfo appInfo():111:111 -> a
     8:8:com.android.tools.r8.graph.DexDefinition definitionFor(com.android.tools.r8.graph.DexReference):153 -> a
-    9:17:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppInfo.definitionFor(com.android.tools.r8.graph.DexReference):114:122 -> a
+    9:17:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppInfo.definitionFor(com.android.tools.r8.graph.DexReference):119:127 -> a
     9:17:com.android.tools.r8.graph.DexDefinition definitionFor(com.android.tools.r8.graph.DexReference):153 -> a
-    18:18:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppInfo.definitionFor(com.android.tools.r8.graph.DexReference):114:114 -> a
+    18:18:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppInfo.definitionFor(com.android.tools.r8.graph.DexReference):119:119 -> a
     18:18:com.android.tools.r8.graph.DexDefinition definitionFor(com.android.tools.r8.graph.DexReference):153 -> a
     19:19:com.android.tools.r8.graph.AppInfo appInfo():111:111 -> a
     19:19:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):158 -> a
@@ -16287,11 +16322,11 @@
     160:171:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):486:497 -> a
     172:172:boolean com.android.tools.r8.graph.MethodAccessFlags.isSynchronized():110:110 -> a
     172:172:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):497 -> a
-    173:173:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():212:212 -> a
+    173:173:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():211:211 -> a
     173:173:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):498 -> a
     174:183:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):499:508 -> a
     184:192:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):506:514 -> a
-    193:193:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():220:220 -> a
+    193:193:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():219:219 -> a
     193:193:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):517 -> a
     194:194:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):517:517 -> a
     1:1:boolean estimatedSizeForInliningAtMost(int):145:145 -> b
@@ -16512,7 +16547,7 @@
     62:66:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):232 -> a
     67:67:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):231:231 -> a
     68:69:java.lang.String getSignature(com.android.tools.r8.graph.DexAnnotation):236:237 -> a
-    70:70:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():896:896 -> a
+    70:70:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():926:926 -> a
     70:70:java.lang.String getSignature(com.android.tools.r8.graph.DexAnnotation):238 -> a
     71:74:java.lang.String getSignature(com.android.tools.r8.graph.DexAnnotation):238:241 -> a
     75:75:com.android.tools.r8.graph.DexAnnotation createThrowsAnnotation(com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexItemFactory):246:246 -> a
@@ -16522,7 +16557,7 @@
     93:93:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
     93:93:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):351 -> a
     94:103:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):351:360 -> a
-    104:104:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():896:896 -> a
+    104:104:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():926:926 -> a
     104:104:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):361 -> a
     105:110:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):361:366 -> a
     111:112:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):363:364 -> a
@@ -16555,18 +16590,18 @@
     4:4:void com.android.tools.r8.utils.Pair.<init>():20:20 -> c
     4:4:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):159 -> c
     5:8:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):160:163 -> c
-    9:9:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():662:662 -> c
+    9:9:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():683:683 -> c
     9:9:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$DexValueString.getValue():0 -> c
     9:9:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):163 -> c
     10:14:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):163:167 -> c
-    15:15:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():439:439 -> c
+    15:15:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():446:446 -> c
     15:15:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):167 -> c
     16:16:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):167:167 -> c
     1:6:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):185:190 -> d
-    7:7:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():896:896 -> d
+    7:7:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():926:926 -> d
     7:7:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):190 -> d
     8:8:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):190:190 -> d
-    9:9:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():896:896 -> d
+    9:9:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():926:926 -> d
     9:9:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):191 -> d
     10:11:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):191:192 -> d
     1:1:boolean isEnclosingClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):123:123 -> e
@@ -16699,9 +16734,11 @@
     14:14:com.android.tools.r8.graph.DexApplication$Builder addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,boolean):201:201 -> a
     15:15:boolean com.android.tools.r8.graph.DexProgramClass.isProgramClass():0:0 -> a
     15:15:com.android.tools.r8.graph.DexApplication$Builder addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,boolean):201 -> a
-    16:21:com.android.tools.r8.graph.DexApplication$Builder addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,boolean):202:207 -> a
-    22:22:com.android.tools.r8.graph.DexApplication$Builder addToMainDexList(java.util.Collection):223:223 -> a
-    23:26:com.android.tools.r8.graph.DexApplication$Builder mergeChecksums(com.android.tools.r8.dex.ClassesChecksum):228:231 -> a
+    16:17:com.android.tools.r8.graph.DexApplication$Builder addProgramClass(com.android.tools.r8.graph.DexProgramClass):195:196 -> a
+    16:17:com.android.tools.r8.graph.DexApplication$Builder addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,boolean):202 -> a
+    18:22:com.android.tools.r8.graph.DexApplication$Builder addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,boolean):203:207 -> a
+    23:23:com.android.tools.r8.graph.DexApplication$Builder addToMainDexList(java.util.Collection):223:223 -> a
+    24:27:com.android.tools.r8.graph.DexApplication$Builder mergeChecksums(com.android.tools.r8.dex.ClassesChecksum):228:231 -> a
     1:1:java.util.Set getMainDexList():219:219 -> b
     1:1:java.util.Collection getProgramClasses():211:211 -> c
     1:1:java.util.Collection getSynthesizedClasses():215:215 -> d
@@ -17443,60 +17480,61 @@
     com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo optimizationInfo -> e
     com.android.tools.r8.graph.FieldAccessFlags accessFlags -> b
     com.android.tools.r8.graph.DexValue staticValue -> d
-    1:2:void <clinit>():16:17 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):30:30 -> <init>
-    2:12:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):24:34 -> <init>
-    1:3:boolean isProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):38:40 -> a
-    4:4:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):60:60 -> a
-    5:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):66:67 -> a
+    1:2:void <clinit>():15:16 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):29:29 -> <init>
+    2:12:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):23:33 -> <init>
+    1:3:boolean isProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):37:39 -> a
+    4:4:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):59:59 -> a
+    5:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):65:66 -> a
     7:7:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):66:66 -> a
-    7:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):67 -> a
-    8:8:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68:68 -> a
+    7:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):66 -> a
+    8:8:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):67:67 -> a
     9:9:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
-    9:9:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68 -> a
-    10:10:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):69:69 -> a
-    11:11:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):75:75 -> a
-    12:12:void setStaticValue(com.android.tools.r8.graph.DexValue):137:137 -> a
+    9:9:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):67 -> a
+    10:10:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68:68 -> a
+    11:11:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):74:74 -> a
+    12:12:void setStaticValue(com.android.tools.r8.graph.DexValue):136:136 -> a
     13:13:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
-    13:13:void setStaticValue(com.android.tools.r8.graph.DexValue):137 -> a
-    14:16:void setStaticValue(com.android.tools.r8.graph.DexValue):137:139 -> a
-    17:32:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):156:171 -> a
-    33:50:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):170:187 -> a
-    51:51:boolean com.android.tools.r8.graph.AccessFlags.isFinal():175:175 -> a
-    51:51:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):187 -> a
-    52:58:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):187:193 -> a
-    59:59:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):147:147 -> a
-    59:59:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):193 -> a
-    60:60:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):194:194 -> a
-    61:61:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):147:147 -> a
-    61:61:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):193 -> a
-    62:62:boolean lambda$valueAsConstInstruction$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):166:166 -> a
-    63:63:java.lang.Boolean lambda$valueAsConstInstruction$1(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):171:171 -> a
-    64:71:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):202:209 -> a
-    1:1:java.lang.String toSmaliString():85:85 -> f
-    1:1:java.lang.String toSourceString():90:90 -> g
+    13:13:void setStaticValue(com.android.tools.r8.graph.DexValue):136 -> a
+    14:16:void setStaticValue(com.android.tools.r8.graph.DexValue):136:138 -> a
+    17:26:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):153:162 -> a
+    27:27:boolean com.android.tools.r8.graph.AccessFlags.isFinal():175:175 -> a
+    27:27:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):162 -> a
+    28:34:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):162:168 -> a
+    35:35:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):150:150 -> a
+    35:35:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):168 -> a
+    36:36:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):169:169 -> a
+    37:37:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):150:150 -> a
+    37:37:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):168 -> a
+    38:54:boolean mayTriggerClassInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):179:195 -> a
+    55:55:boolean mayTriggerClassInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):194:194 -> a
+    56:56:boolean lambda$mayTriggerClassInitializationSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):190:190 -> a
+    57:57:java.lang.Boolean lambda$mayTriggerClassInitializationSideEffects$1(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):195:195 -> a
+    58:65:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):202:209 -> a
+    1:1:java.lang.String toSmaliString():84:84 -> f
+    1:1:java.lang.String toSourceString():89:89 -> g
     com.android.tools.r8.graph.DexEncodedField asDexEncodedField() -> i
     boolean isDexEncodedField() -> l
-    1:1:boolean isStaticMember():124:124 -> n
-    1:1:com.android.tools.r8.graph.DexReference toReference():100:100 -> o
-    1:1:com.android.tools.r8.graph.DexField getKey():95:95 -> p
-    2:2:com.android.tools.r8.graph.DexField getKey():95:95 -> p
-    2:2:com.android.tools.r8.graph.PresortedComparable getKey():16 -> p
-    1:7:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():50:56 -> q
-    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():46:46 -> r
-    1:1:com.android.tools.r8.graph.DexValue getStaticValue():143:143 -> s
+    1:1:boolean isStaticMember():123:123 -> n
+    1:1:com.android.tools.r8.graph.DexReference toReference():99:99 -> o
+    1:1:com.android.tools.r8.graph.DexField getKey():94:94 -> p
+    2:2:com.android.tools.r8.graph.DexField getKey():94:94 -> p
+    2:2:com.android.tools.r8.graph.PresortedComparable getKey():15 -> p
+    1:7:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():49:55 -> q
+    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():45:45 -> r
+    1:1:com.android.tools.r8.graph.DexValue getStaticValue():142:142 -> s
     2:2:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> s
-    2:2:com.android.tools.r8.graph.DexValue getStaticValue():143 -> s
-    3:4:com.android.tools.r8.graph.DexValue getStaticValue():143:144 -> s
-    1:1:boolean hasAnnotation():128:128 -> t
-    1:1:java.lang.String toString():80:80 -> toString
-    1:1:boolean hasExplicitStaticValue():132:132 -> u
+    2:2:com.android.tools.r8.graph.DexValue getStaticValue():142 -> s
+    3:4:com.android.tools.r8.graph.DexValue getStaticValue():142:143 -> s
+    1:1:boolean hasAnnotation():127:127 -> t
+    1:1:java.lang.String toString():79:79 -> toString
+    1:1:boolean hasExplicitStaticValue():131:131 -> u
     2:2:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> u
-    2:2:boolean hasExplicitStaticValue():132 -> u
-    3:4:boolean hasExplicitStaticValue():132:133 -> u
-    1:1:boolean isStatic():115:115 -> v
+    2:2:boolean hasExplicitStaticValue():131 -> u
+    3:4:boolean hasExplicitStaticValue():131:132 -> u
+    1:1:boolean isStatic():114:114 -> v
     2:2:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> v
-    2:2:boolean isStatic():115 -> v
+    2:2:boolean isStatic():114 -> v
 com.android.tools.r8.graph.DexEncodedMethod -> com.android.tools.r8.C.z0:
     com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo callSiteOptimizationInfo -> h
     boolean obsolete -> m
@@ -17520,11 +17558,11 @@
     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:java.util.Map getParameterInfo():504:504 -> A
+    1:2:boolean hasAnnotation():1080:1081 -> B
+    1:2:boolean hasClassFileVersion():565:566 -> C
+    1:1:boolean hasCode():545:545 -> D
+    1:1:boolean hasParameterInfo():500:500 -> 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():248 -> F
@@ -17583,383 +17621,379 @@
     6:6:boolean isVirtualMethod():286:286 -> V
     7:7:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> V
     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:2:void markNotProcessed():451:452 -> W
+    1:2:java.lang.String qualifiedName():577:578 -> X
+    1:2:void removeCode():554:555 -> 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):1316 -> a
-    7:7:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1317:1317 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1050 -> a
+    6:6:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1317 -> a
+    7:7:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1318:1318 -> a
     8:8:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
-    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
+    8:8:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1318 -> a
+    9:9:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1318:1318 -> a
     10:10:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> a
-    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
+    10:10:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1318 -> a
+    11:11:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1319:1319 -> 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
+    14: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:420 -> 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):405:408 -> 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):398:401 -> 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):391:394 -> a
+    82:114: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):384:416 -> a
+    115:134:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):425:444 -> a
+    135:135:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):441:441 -> a
+    136:136:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):438:438 -> a
+    137:137:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):435:435 -> a
+    138:138:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):432:432 -> a
+    139:157:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):429:447 -> a
+    158:159:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):456:457 -> a
+    160: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):466:467 -> a
+    162:165:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):472:475 -> a
+    166:166:boolean hasParameterInfo():500:500 -> a
+    166:166:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):475 -> a
+    167:168:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):475:476 -> a
+    169:170:void setParameterInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):495:496 -> a
+    169:170:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):476 -> a
+    171:171:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):478:478 -> 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):482:484 -> a
+    175:176:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):516:517 -> a
+    177:177:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
+    177:177:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):517 -> a
+    178:179:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):518:519 -> a
+    180:180:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod):50:50 -> a
+    180:180:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):519 -> a
+    181:181:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):521:521 -> a
+    182:182:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
+    182:182:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):521 -> a
+    183:183:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):522:522 -> 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
+    184:184:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):522 -> a
+    185:185:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):527:527 -> a
+    186:191:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):532:537 -> a
+    192:200:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):587:595 -> a
+    201:206:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):599:604 -> a
+    207:207:java.lang.String com.android.tools.r8.graph.DexItem.toSmaliString():60:60 -> a
+    207:207:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):604 -> a
+    208:209:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):604:605 -> a
+    210:210:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():99:99 -> a
+    210:210:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():95 -> a
+    210:210:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):605 -> a
+    211:217:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):605:611 -> a
+    218:226:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):332:340 -> a
+    218:226:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    227:227:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    227:227:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):342 -> a
+    227:227:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    228:229:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):342:343 -> a
+    228:229:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    230:230:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    230:230:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):344 -> a
+    230:230:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    231:231:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):344:344 -> a
+    231:231:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> 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
+    232:232:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):345 -> a
+    232:232:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    233:238:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):345:350 -> a
+    233:238:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    239:239:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    239:239:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):351 -> a
+    239:239:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    240:243:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):351:354 -> a
+    240:243:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    244:244:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    244:244:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):355 -> a
+    244:244:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    245:251:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):355:361 -> a
+    245:251:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    252:252:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    252:252:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):362 -> a
+    252:252:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    253:254:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):362:363 -> a
+    253:254:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    255:255:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    255:255:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):364 -> a
+    255:255:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    256:259:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):364:367 -> a
+    256:259:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    260:260:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    260:260:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):368 -> a
+    260:260:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    261:282:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):368:389 -> a
+    261:282:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    283:286:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612:615 -> a
+    287:287:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():99:99 -> a
+    287:287:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():95 -> a
+    287:287:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):605 -> a
+    288:288:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):642:642 -> a
+    289:289:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
+    289:289:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):643 -> a
+    290:292:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):644:646 -> a
+    293:293:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
+    293:293:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):646 -> a
+    294:298:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):647:651 -> a
+    299:300:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):706:707 -> a
+    301:302:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):726:727 -> a
+    301:302:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    303:303:com.android.tools.r8.naming.MemberNaming$MethodSignature com.android.tools.r8.naming.MemberNaming$MethodSignature.fromDexMethod(com.android.tools.r8.graph.DexMethod):225:225 -> a
+    303:303:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):727 -> a
+    303:303:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    304:306:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):728:730 -> a
+    304:306:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    307:311:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):729:733 -> a
+    307:311:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    312:312:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    312:312:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):736 -> a
+    312:312:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    313:313:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):736:736 -> a
+    313:313:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    314:314:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):735:735 -> a
+    314:314:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    315:315:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    315:315:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):737 -> a
+    315:315:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    316:319:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):738:741 -> a
+    316:319:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    320:335:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):739:754 -> a
+    320:335:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    336:336:void setObsolete():166:166 -> a
+    336:336:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):755 -> a
+    336:336:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    337:337:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):756:756 -> a
+    337:337:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    338:338:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709:709 -> a
+    339:340:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):760:761 -> a
+    339:340:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    341:341:com.android.tools.r8.naming.MemberNaming$MethodSignature com.android.tools.r8.naming.MemberNaming$MethodSignature.fromDexMethod(com.android.tools.r8.graph.DexMethod):225:225 -> a
+    341:341:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):761 -> a
+    341:341:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    342:344:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):762:764 -> a
+    342:344:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    345:347:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):763:765 -> a
+    345:347:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    348:348:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    348:348:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):766 -> a
+    348:348:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    349:353:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):767:771 -> a
+    349:353:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    354:362:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):768:776 -> a
+    354:362:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    363:363:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):773:773 -> a
+    363:363:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    364:364:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    364:364:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):777 -> a
+    364:364:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    365:368:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):778:781 -> a
+    365:368:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    369:373:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):779:783 -> a
+    369:373:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    374:374:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
+    374:374:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):783 -> a
+    374:374:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    375:376:boolean isStaticMember():334:335 -> a
+    375:376:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):784 -> a
+    375:376:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    377:399:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):788:810 -> a
+    377:399:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    400:400:void setObsolete():166:166 -> a
+    400:400:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):811 -> a
+    400:400:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    401:401:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):812:812 -> a
+    401:401:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    402:406:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):714:718 -> a
+    407:411:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):717:721 -> a
+    412:412:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
+    412:412:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):721 -> a
+    413:413:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):721:721 -> a
+    414:415:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):816:817 -> a
+    416:430:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):821:835 -> a
+    431:431:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):851:851 -> a
+    432:432:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> a
+    432:432:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):851 -> a
+    433:449:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):851:867 -> a
+    450:450:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
+    450:450:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):867 -> a
+    451:453:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):867:869 -> a
+    454:454:void com.android.tools.r8.graph.AccessFlags.unsetPrivate():150:150 -> a
+    454:454:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):869 -> a
+    455:455:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):870:870 -> a
+    456:456:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
+    456:456:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):870 -> a
+    457:457:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):871:871 -> a
+    458:458:void com.android.tools.r8.graph.MethodAccessFlags.setConstructor():174:174 -> a
+    458:458:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):871 -> a
+    459:459:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):872:872 -> a
+    460:465: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):877:882 -> a
+    466:489: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):879:902 -> a
+    490:490: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):887:887 -> a
+    491:494:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):890:893 -> a
+    495:495:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstance():466:466 -> a
+    495:495:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():482 -> a
+    495:495:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):894 -> a
+    496:496:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():482:482 -> a
+    496:496:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):894 -> a
+    497:499:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):895:897 -> a
+    500:500:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():474:474 -> a
+    500:500:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):897 -> a
+    501:502:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):897:898 -> a
+    503:505:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):906:908 -> a
+    506:509: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):917:920 -> a
+    510:510:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
+    510:510: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):920 -> a
+    511: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):921:921 -> a
+    512:512:void com.android.tools.r8.graph.AccessFlags.setStatic():171:171 -> 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):921 -> 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):922:922 -> a
+    514:514:void com.android.tools.r8.graph.AccessFlags.unsetPrivate():150:150 -> 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):922 -> a
+    515:519: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):923:927 -> a
+    520:524: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):924:928 -> a
+    525:530:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):963:968 -> a
+    531:531:void com.android.tools.r8.graph.AccessFlags.demote(int):246:246 -> a
+    531:531:void com.android.tools.r8.graph.AccessFlags.demoteFromFinal():203 -> a
+    531:531:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):968 -> a
+    532:533:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):970:971 -> a
+    534:534:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
+    534:534:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):971 -> a
+    535:538:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):971:974 -> a
+    539:539:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> a
+    539:539:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):974 -> a
+    540:540:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):977:977 -> a
+    541:541:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():154:154 -> a
+    541:541:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):977 -> a
+    542:546:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):980:984 -> a
+    547:547:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
+    547:547:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):984 -> a
+    548:549:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):984:985 -> a
+    550:550:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
+    550:550:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):985 -> a
+    551:565:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):985:999 -> a
+    566:566:void com.android.tools.r8.graph.MethodAccessFlags.setBridge():126:126 -> a
+    566:566:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):999 -> a
+    567:567:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1001:1001 -> a
+    568:568:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
+    568:568:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1001 -> a
+    569:569:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1004:1004 -> a
+    570:581:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1024:1035 -> a
+    582:592:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1034:1044 -> a
+    593:596:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1085:1088 -> a
+    597:597:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    597:597:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1088 -> a
+    598:598:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1090:1090 -> a
+    599:600:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):1166:1167 -> a
+    601:601:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1189:1189 -> a
+    602:603:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1153:1154 -> a
+    602:603:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1191 -> a
+    604:608:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1191:1195 -> a
+    609:609:boolean hasSingleTarget():1341:1341 -> a
+    610:611:void forEachTarget(java.util.function.Consumer):1353:1354 -> 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:com.android.tools.r8.graph.Code getCode():549:550 -> 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):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
+    12:15:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):488:491 -> b
+    16:17:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1153:1154 -> b
+    16:17:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):491 -> b
+    18:18:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):491:491 -> b
+    19:22:void upgradeClassFileVersion(int):570:573 -> b
+    23:23:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):932:932 -> 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):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
+    24:24:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):932 -> b
+    25:32:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):932:939 -> 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):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
+    33:33:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):939 -> b
+    34:36:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):939:941 -> 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):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
+    37:37:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):941 -> b
+    38:50:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):941:953 -> 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):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
+    51:51:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):953 -> b
+    52:52:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):954:954 -> 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):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
+    53:53:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):954 -> b
+    54:54:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):955:955 -> 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):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
+    55:55:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):955 -> b
+    56:59:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):956:959 -> b
+    60:60:void lambda$toForwardingMethod$4(com.android.tools.r8.graph.UseRegistry):993:993 -> b
     61:61:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> b
-    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
+    61:61:void lambda$toForwardingMethod$4(com.android.tools.r8.graph.UseRegistry):993 -> b
+    62:64:void lambda$toForwardingMethod$4(com.android.tools.r8.graph.UseRegistry):994:996 -> b
+    65:65:com.android.tools.r8.graph.DexEncodedMethod asSingleTarget():1335:1335 -> b
+    1:1:boolean shouldNotHaveCode():541:541 -> b0
     2:2:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> b0
-    2:2:boolean shouldNotHaveCode():546 -> b0
-    3:3:boolean shouldNotHaveCode():546:546 -> b0
+    2:2:boolean shouldNotHaveCode():541 -> b0
+    3:3:boolean shouldNotHaveCode():541:541 -> b0
     4:4:boolean com.android.tools.r8.graph.MethodAccessFlags.isNative():142:142 -> b0
-    4:4:boolean shouldNotHaveCode():546 -> b0
+    4:4:boolean shouldNotHaveCode():541 -> 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
+    2:2:void lambda$toInitializerForwardingBridge$0(com.android.tools.r8.graph.UseRegistry):866:866 -> c
+    3:3:com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve():1329:1329 -> c
+    1:4:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():625:628 -> c0
     5:5:boolean com.android.tools.r8.graph.AccessFlags.isFinal():175:175 -> c0
-    5:5:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():633 -> c0
-    6:8:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():633:635 -> c0
+    5:5:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():628 -> c0
+    6:8:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():628:630 -> c0
     9:9:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> c0
-    9:9:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():635 -> c0
-    10:11:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():635:636 -> c0
+    9:9:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():630 -> c0
+    10:11:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():630:631 -> c0
     12:12:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():154:154 -> c0
-    12:12:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():636 -> c0
-    13:13:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():637:637 -> c0
+    12:12:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():631 -> c0
+    13:13:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():632:632 -> 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
+    2:2:void lambda$toStaticForwardingBridge$3(com.android.tools.r8.graph.UseRegistry):947:947 -> d
     3:3:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> d
-    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
+    3:3:void lambda$toStaticForwardingBridge$3(com.android.tools.r8.graph.UseRegistry):947 -> d
+    4:6:void lambda$toStaticForwardingBridge$3(com.android.tools.r8.graph.UseRegistry):948:950 -> d
+    7:7:boolean isValidVirtualTargetForDynamicDispatch():1324:1324 -> d
+    1:7:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():696:702 -> 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
+    2:3:java.util.List asListOfTargets():1347:1348 -> e
+    1:10:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex():672:681 -> 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
+    1:2:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1008:1009 -> f0
     3:3:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> f0
-    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
+    3:3:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1009 -> f0
+    4:11:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1009:1016 -> f0
+    12:12:void setObsolete():166:166 -> f0
+    12:12:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1017 -> f0
+    1:2:java.lang.String toSourceString():620:621 -> g
+    3:3:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1200:1200 -> 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:1:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():1075:1075 -> j
+    1:1:boolean isDexEncodedMethod():1069:1069 -> 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
+    1:2:com.android.tools.r8.graph.DexReference toReference():1063:1064 -> o
+    1:1:com.android.tools.r8.graph.DexMethod getKey():1058:1058 -> p
+    2:2:com.android.tools.r8.graph.DexMethod getKey():1058:1058 -> p
     2:2:com.android.tools.r8.graph.PresortedComparable getKey():80 -> p
-    1:2:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():690:691 -> q
+    1:2:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():685:686 -> q
     3:3:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> q
-    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
+    3:3:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():689 -> q
+    4:6:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():690:692 -> q
+    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():661:662 -> r
+    1:2:java.lang.String codeToString():1050:1051 -> s
+    1:2:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getCallSiteOptimizationInfo():1171:1172 -> t
+    1:2:java.lang.String toString():509:510 -> toString
+    1:3:int getClassFileVersion():559:561 -> u
+    1:2:com.android.tools.r8.graph.Code getCode():549:550 -> 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
+    1:9:com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo getMutableCallSiteOptimizationInfo(com.android.tools.r8.graph.AppView):1177:1185 -> x
+    1:5:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMutableOptimizationInfo():1158:1162 -> y
+    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1153:1154 -> z
 com.android.tools.r8.graph.DexEncodedMethod$1 -> com.android.tools.r8.C.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>():429:429 -> <clinit>
-    2:2:void <clinit>():384:384 -> <clinit>
+    1:1:void <clinit>():427:427 -> <clinit>
+    2:2:void <clinit>():379:379 -> <clinit>
 com.android.tools.r8.graph.DexEncodedMethod$Builder -> com.android.tools.r8.C.t0:
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState compilationState -> f
     com.android.tools.r8.graph.DexAnnotationSet annotations -> c
@@ -17970,31 +18004,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>():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():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():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
+    1:1:void <clinit>():1203:1203 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$1):1203:1203 -> <init>
+    2:18:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1214:1230 -> <init>
+    19:19:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1226:1226 -> <init>
+    1:1:com.android.tools.r8.graph.MethodAccessFlags access$000(com.android.tools.r8.graph.DexEncodedMethod$Builder):1203:1203 -> a
+    2:2:void setMethod(com.android.tools.r8.graph.DexMethod):1235:1235 -> a
+    3:22:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1244:1263 -> a
+    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1239:1239 -> a
+    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1263 -> a
+    24:26:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1266:1268 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1239:1239 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1266 -> a
+    28:30:com.android.tools.r8.graph.DexEncodedMethod$Builder adjustOptimizationInfoAfterRemovingThisParameter():1288:1290 -> a
+    31:31:void setCode(com.android.tools.r8.graph.Code):1296:1296 -> a
+    1:6:com.android.tools.r8.graph.DexEncodedMethod build():1300:1305 -> b
+    7:7:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> b
+    7:7:com.android.tools.r8.graph.DexEncodedMethod build():1305 -> b
+    8:14:com.android.tools.r8.graph.DexEncodedMethod build():1304:1310 -> b
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1273:1273 -> c
+    2:2:void com.android.tools.r8.graph.AccessFlags.promoteToStatic():216:216 -> c
+    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1273 -> c
+    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1278:1282 -> d
 com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility -> com.android.tools.r8.C.u0:
     boolean returnsReceiver -> a
-    1:2:void <init>(boolean):1104:1105 -> <init>
+    1:2:void <init>(boolean):1102:1103 -> <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
@@ -18009,18 +18043,18 @@
     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):1109:1109 -> <init>
-    2:2:void <init>():1111:1111 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):1107:1107 -> <init>
+    2:2:void <init>():1109:1109 -> <init>
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer asTrivialClassInitializer() -> a
     boolean isTrivialInstanceInitializer() -> b
 com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer -> com.android.tools.r8.C.w0:
     com.android.tools.r8.graph.DexField field -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexField):1143:1144 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.DexField):1141:1142 -> <init>
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer asTrivialClassInitializer() -> a
 com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer -> com.android.tools.r8.C.x0:
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer INSTANCE -> a
-    1:1:void <clinit>():1126:1126 -> <clinit>
-    1:1:void <init>():1129:1129 -> <init>
+    1:1:void <clinit>():1124:1124 -> <clinit>
+    1:1:void <init>():1127:1127 -> <init>
     boolean isTrivialInstanceInitializer() -> b
 com.android.tools.r8.graph.DexField -> com.android.tools.r8.C.A0:
     com.android.tools.r8.graph.DexString name -> g
@@ -18089,394 +18123,395 @@
     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 getMethodName -> A0
+    com.android.tools.r8.graph.DexString getDeclaredFieldName -> A0
     com.android.tools.r8.graph.DexString unboxLongMethodName -> Q
-    com.android.tools.r8.graph.DexString strictMathDescriptor -> b1
-    com.android.tools.r8.graph.DexType proxyType -> F2
+    com.android.tools.r8.graph.DexString mathDescriptor -> b1
+    com.android.tools.r8.graph.DexType invocationHandlerType -> F2
     com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd setPrologueEnd -> m
     java.util.concurrent.ConcurrentHashMap classTypeLatticeInterfaces -> q
-    com.android.tools.r8.graph.DexString 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 assertionErrorDescriptor -> I0
+    com.android.tools.r8.graph.DexString proxyDescriptor -> j1
+    com.android.tools.r8.graph.DexString nameMethodName -> r0
     com.android.tools.r8.graph.DexString shortDescriptor -> A
-    com.android.tools.r8.graph.DexType longType -> V1
-    com.android.tools.r8.graph.DexType classType -> w2
+    com.android.tools.r8.graph.DexType intType -> V1
+    com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> w2
     java.util.concurrent.ConcurrentHashMap strings -> a
-    com.android.tools.r8.graph.DexMethod 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 getFieldName -> z0
+    java.util.Set libraryTypesAssumedToBePresent -> g4
+    com.android.tools.r8.graph.DexType lookupType -> O3
+    com.android.tools.r8.graph.DexType classArrayType -> o2
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> c3
     com.android.tools.r8.graph.DexString contentEqualsMethodName -> a0
-    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> G3
+    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> G3
     com.android.tools.r8.graph.DexString unboxFloatMethodName -> R
-    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$StringMethods stringMethods -> f3
-    com.android.tools.r8.graph.DexString autoCloseableDescriptor -> Q0
-    com.android.tools.r8.graph.DexString callableDescriptor -> r1
+    com.android.tools.r8.graph.DexType boxedShortType -> g2
+    com.android.tools.r8.graph.DexString unknownTypeName -> k4
+    com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> I1
+    com.android.tools.r8.graph.DexString valueOfMethodName -> i0
+    com.android.tools.r8.graph.DexString classLoaderDescriptor -> Q0
+    com.android.tools.r8.graph.DexString comparatorDescriptor -> r1
     com.android.tools.r8.graph.DexString voidDescriptor -> B
-    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> W2
-    com.android.tools.r8.graph.DexType annotationEnclosingClass -> 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 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 objectsDescriptor -> Y0
+    com.android.tools.r8.graph.DexString illegalAccessErrorDescriptor -> z1
+    com.android.tools.r8.graph.DexType callableType -> O2
+    com.android.tools.r8.graph.DexMethod stringConcatMethod -> b4
+    com.android.tools.r8.graph.DexString icceDescriptor -> A1
+    com.android.tools.r8.kotlin.Kotlin kotlin -> q3
     com.android.tools.r8.graph.DexString unboxDoubleMethodName -> S
     com.android.tools.r8.graph.DexString booleanDescriptor -> t
-    com.android.tools.r8.graph.DexString 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 invocationHandlerDescriptor -> i1
+    com.android.tools.r8.graph.DexType methodTypeType -> E2
+    com.android.tools.r8.graph.DexString runtimeExceptionDescriptor -> H0
+    com.android.tools.r8.graph.DexString classDescriptor -> P0
+    com.android.tools.r8.graph.DexString collectionDescriptor -> q1
+    com.android.tools.r8.graph.DexString ordinalMethodName -> q0
+    com.android.tools.r8.graph.DexType floatType -> U1
+    com.android.tools.r8.graph.DexType strictMathType -> v2
     com.android.tools.r8.graph.DexString boxedBooleanDescriptor -> C
-    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.DexMethod metafactoryAltMethod -> Y3
+    com.android.tools.r8.graph.DexString getDeclaredConstructorName -> y0
+    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> f4
+    com.android.tools.r8.graph.DexType objectArrayType -> n2
+    com.android.tools.r8.graph.DexType callSiteType -> N3
+    com.android.tools.r8.graph.DexString iterableDescriptor -> a1
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> d3
+    com.android.tools.r8.graph.DexType boxedLongType -> f2
     com.android.tools.r8.graph.DexString isEmptyMethodName -> T
     com.android.tools.r8.graph.DexString byteDescriptor -> u
-    com.android.tools.r8.graph.DexString valueOfMethodName -> h0
-    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 trimName -> h0
+    com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> H1
+    com.android.tools.r8.graph.DexType annotationThrows -> F3
+    com.android.tools.r8.graph.DexString finalizeMethodName -> p0
+    com.android.tools.r8.graph.DexItemFactory$StringMethods stringMethods -> g3
+    com.android.tools.r8.graph.DexString throwableArrayDescriptor -> P1
+    com.android.tools.r8.graph.DexType illegalAccessErrorType -> V2
     com.android.tools.r8.graph.DexString boxedByteDescriptor -> D
-    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
+    com.android.tools.r8.graph.DexString annotationDescriptor -> X0
+    com.android.tools.r8.graph.DexString throwableDescriptor -> 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 getDeclaredMethodName -> C0
+    com.android.tools.r8.graph.DexString stringBuilderDescriptor -> d1
     java.util.Map setInlineFrames -> o
-    com.android.tools.r8.graph.DexType methodTypeType -> D2
+    com.android.tools.r8.graph.DexType methodHandleType -> D2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap defaults -> i
-    com.android.tools.r8.graph.DexString stringDescriptor -> K0
-    com.android.tools.r8.graph.DexString listDescriptor -> l1
-    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> k3
+    com.android.tools.r8.graph.DexString charSequenceArrayDescriptor -> K0
+    com.android.tools.r8.graph.DexString serviceLoaderConfigurationErrorDescriptor -> l1
     com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin setEpilogueBegin -> l
-    com.android.tools.r8.graph.DexString getNameName -> t0
+    com.android.tools.r8.graph.DexString forNameMethodName -> t0
     java.util.concurrent.ConcurrentHashMap methods -> e
-    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.DexType comparableType -> U3
+    com.android.tools.r8.graph.DexType doubleType -> T1
+    com.android.tools.r8.graph.DexType mathType -> 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 objectArrayType -> m2
-    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> n3
-    com.android.tools.r8.graph.DexString noSuchFieldErrorDescriptor -> C1
+    com.android.tools.r8.graph.DexType objectType -> m2
+    com.android.tools.r8.graph.DexString noClassDefFoundErrorDescriptor -> C1
+    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> W3
     com.android.tools.r8.graph.DexString lastIndexOfMethodName -> c0
-    com.android.tools.r8.graph.DexType boxedLongType -> e2
+    com.android.tools.r8.graph.DexType boxedIntType -> e2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap advancePCs -> h
-    com.android.tools.r8.graph.DexType annotationThrows -> E3
-    com.android.tools.r8.graph.DexString classConstructorMethodName -> K1
-    com.android.tools.r8.graph.DexString convertMethodName -> k0
-    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> u3
-    com.android.tools.r8.graph.DexString constructorDescriptor -> S0
-    com.android.tools.r8.graph.DexString consumerDescriptor -> t1
+    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> E3
+    com.android.tools.r8.graph.DexString constructorMethodName -> K1
+    com.android.tools.r8.graph.DexString internMethodName -> k0
+    com.android.tools.r8.graph.DexString classArrayDescriptor -> S0
+    com.android.tools.r8.graph.DexString supplierDescriptor -> t1
     java.util.concurrent.ConcurrentHashMap protos -> d
-    com.android.tools.r8.graph.DexType illegalAccessErrorType -> U2
-    com.android.tools.r8.graph.DexType comparatorType -> M2
+    com.android.tools.r8.graph.DexType throwableType -> U2
+    com.android.tools.r8.graph.DexType mapEntryType -> M2
     com.android.tools.r8.graph.DexString unboxCharMethodName -> N
-    com.android.tools.r8.graph.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.graph.DexString strictMathDescriptor -> c1
+    com.android.tools.r8.graph.DexString getMethodName -> B0
+    com.android.tools.r8.graph.DexType varHandleType -> C2
+    com.android.tools.r8.graph.DexString serviceLoaderDescriptor -> k1
+    com.android.tools.r8.graph.DexString charSequenceDescriptor -> J0
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap restartLocals -> k
-    com.android.tools.r8.graph.DexString forNameMethodName -> s0
-    com.android.tools.r8.graph.DexType doubleType -> S1
-    com.android.tools.r8.graph.DexType mathType -> t2
+    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> l3
+    com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> s0
+    com.android.tools.r8.graph.DexType charType -> S1
+    com.android.tools.r8.graph.DexType iterableType -> t2
     java.util.concurrent.ConcurrentHashMap fields -> c
-    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.DexItemFactory$PolymorphicMethods polymorphicMethods -> r3
+    com.android.tools.r8.graph.DexType externalizableType -> T3
+    java.util.Set libraryClassesWithoutStaticInitialization -> h4
+    com.android.tools.r8.graph.DexType stringArrayType -> l2
     com.android.tools.r8.graph.DexString unboxShortMethodName -> O
-    com.android.tools.r8.graph.DexType metafactoryType -> 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 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.graph.DexString exceptionInInitializerErrorDescriptor -> B1
+    com.android.tools.r8.graph.DexType boxedFloatType -> d2
+    com.android.tools.r8.graph.DexType annotationSignature -> D3
+    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> o3
+    com.android.tools.r8.graph.DexString toStringMethodName -> j0
+    com.android.tools.r8.graph.DexString newUpdaterName -> J1
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap endLocals -> j
-    com.android.tools.r8.graph.DexString classArrayDescriptor -> R0
-    com.android.tools.r8.graph.DexString supplierDescriptor -> s1
-    com.android.tools.r8.graph.DexType throwableType -> T2
+    com.android.tools.r8.graph.DexString autoCloseableDescriptor -> R0
+    com.android.tools.r8.graph.DexString callableDescriptor -> 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 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 collectionsDescriptor -> Z0
+    com.android.tools.r8.graph.DexType mapType -> L2
+    com.android.tools.r8.graph.DexString assertionsDisabled -> E0
+    com.android.tools.r8.graph.DexString varHandleDescriptor -> f1
+    com.android.tools.r8.graph.DexType stringBufferType -> B2
     com.android.tools.r8.graph.DexString equalsMethodName -> Y
     com.android.tools.r8.graph.DexString longDescriptor -> z
-    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 stringArrayDescriptor -> M0
+    com.android.tools.r8.graph.DexString setDescriptor -> n1
+    com.android.tools.r8.graph.DexType boxedBooleanType -> Z1
+    com.android.tools.r8.graph.DexString getCanonicalNameName -> v0
+    com.android.tools.r8.graph.DexType serializableType -> S3
+    com.android.tools.r8.graph.DexType byteType -> R1
+    com.android.tools.r8.graph.DexType collectionsType -> s2
     com.android.tools.r8.graph.DexString boxedLongDescriptor -> I
-    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
+    java.util.Set libraryMethodsReturningReceiver -> c4
+    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> K3
+    com.android.tools.r8.graph.DexType stringType -> k2
+    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> k3
+    com.android.tools.r8.graph.DexString npeDescriptor -> E1
     com.android.tools.r8.utils.LRUCacheTable leastUpperBoundOfInterfacesTable -> r
     com.android.tools.r8.graph.DexString compareToIgnoreCaseMethodName -> e0
-    com.android.tools.r8.graph.DexType annotationSignature -> C3
-    com.android.tools.r8.graph.DexType boxedFloatType -> c2
+    com.android.tools.r8.graph.DexType annotationMethodParameters -> C3
+    com.android.tools.r8.graph.DexType boxedDoubleType -> c2
     com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> Z
-    com.android.tools.r8.graph.DexString 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 thisName -> M1
+    com.android.tools.r8.graph.DexString wrapperFieldName -> m0
+    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> p3
+    com.android.tools.r8.graph.DexString fieldDescriptor -> U0
+    com.android.tools.r8.graph.DexString runnableDescriptor -> v1
+    com.android.tools.r8.graph.DexType 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 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.graph.DexType setType -> K2
+    boolean skipNameValidationForTesting -> i4
+    com.android.tools.r8.graph.DexString stringBufferDescriptor -> e1
+    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> I2
+    com.android.tools.r8.graph.DexString newInstanceName -> D0
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap advanceLines -> g
-    com.android.tools.r8.graph.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.DexType reflectiveOperationExceptionType -> b3
+    com.android.tools.r8.graph.DexString stringDescriptor -> L0
+    com.android.tools.r8.graph.DexString listDescriptor -> m1
+    com.android.tools.r8.graph.DexType stringBuilderType -> A2
+    com.android.tools.r8.graph.DexType voidType -> Y1
+    com.android.tools.r8.graph.DexType autoCloseableType -> z2
+    com.android.tools.r8.graph.DexType stringConcatFactoryType -> Z3
+    com.android.tools.r8.graph.DexString getNameName -> u0
+    com.android.tools.r8.graph.DexType booleanType -> Q1
+    com.android.tools.r8.graph.DexType objectsType -> r2
+    com.android.tools.r8.graph.DexType enumerationType -> R3
     com.android.tools.r8.graph.DexString boxedNumberDescriptor -> K
-    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.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> j3
+    com.android.tools.r8.graph.DexType charSequenceArrayType -> j2
     com.android.tools.r8.graph.DexString compareToMethodName -> d0
-    com.android.tools.r8.graph.DexString npeDescriptor -> D1
-    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> J3
+    com.android.tools.r8.graph.DexString noSuchFieldErrorDescriptor -> D1
+    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> J3
     java.util.Map setFiles -> n
-    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
+    com.android.tools.r8.graph.DexType boxedCharType -> b2
+    com.android.tools.r8.graph.DexString convertMethodName -> l0
+    com.android.tools.r8.graph.DexType annotationMemberClasses -> B3
+    com.android.tools.r8.graph.DexString classConstructorMethodName -> L1
+    com.android.tools.r8.graph.DexType noSuchFieldErrorType -> Z2
     java.util.concurrent.ConcurrentHashMap methodHandles -> f
-    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 constructorDescriptor -> T0
+    com.android.tools.r8.graph.DexString consumerDescriptor -> 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 setType -> J2
-    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> H2
+    com.android.tools.r8.graph.DexType listType -> J2
+    com.android.tools.r8.graph.DexType serviceLoaderType -> H2
     com.android.tools.r8.graph.DexString lengthMethodName -> U
+    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> n3
     com.android.tools.r8.graph.DexString charDescriptor -> v
-    com.android.tools.r8.graph.DexString 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 invokeExactMethodName -> G0
+    com.android.tools.r8.graph.DexString methodTypeDescriptor -> h1
+    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> e3
+    com.android.tools.r8.graph.DexType npeType -> a3
+    com.android.tools.r8.graph.DexString objectArrayDescriptor -> O0
+    com.android.tools.r8.graph.DexString mapEntryDescriptor -> p1
+    com.android.tools.r8.graph.DexType shortType -> X1
+    com.android.tools.r8.graph.DexType classLoaderType -> y2
     com.android.tools.r8.graph.DexString boxedCharDescriptor -> E
-    com.android.tools.r8.graph.DexMethod 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.DexMethod metafactoryMethod -> X3
+    com.android.tools.r8.graph.DexString getTypeNameName -> x0
+    com.android.tools.r8.graph.DexType listIteratorType -> Q3
+    com.android.tools.r8.graph.DexType annotationType -> q2
+    com.android.tools.r8.graph.DexType nullValueType -> j4
+    com.android.tools.r8.graph.DexType charSequenceType -> i2
+    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> I3
+    com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> G1
     com.android.tools.r8.graph.DexString containsMethodName -> V
     com.android.tools.r8.graph.DexString doubleDescriptor -> w
     com.android.tools.r8.graph.DexString substringName -> g0
-    com.android.tools.r8.graph.DexType 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.DexType boxedByteType -> a2
+    com.android.tools.r8.graph.DexType annotationInnerClass -> A3
+    com.android.tools.r8.graph.DexString getClassMethodName -> 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 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 enumDescriptor -> W0
+    com.android.tools.r8.graph.DexString arraysDescriptor -> x1
+    com.android.tools.r8.graph.DexType consumerType -> Q2
+    com.android.tools.r8.graph.DexType proxyType -> G2
+    com.android.tools.r8.graph.DexString methodHandleDescriptor -> g1
+    com.android.tools.r8.graph.DexString invokeMethodName -> F0
     com.android.tools.r8.graph.DexString startsWithMethodName -> W
     com.android.tools.r8.graph.DexString floatDescriptor -> x
-    com.android.tools.r8.graph.DexString objectArrayDescriptor -> N0
-    com.android.tools.r8.graph.DexString mapEntryDescriptor -> o1
+    com.android.tools.r8.graph.DexString objectDescriptor -> N0
+    com.android.tools.r8.graph.DexString mapDescriptor -> o1
     boolean sorted -> s
-    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.DexType longType -> W1
+    com.android.tools.r8.graph.DexType classType -> x2
+    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> V3
     com.android.tools.r8.graph.DexString boxedFloatDescriptor -> G
-    com.android.tools.r8.graph.DexString 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 getSimpleNameName -> w0
+    com.android.tools.r8.graph.DexType charArrayType -> O1
+    com.android.tools.r8.graph.DexType enumType -> p2
+    com.android.tools.r8.graph.DexType iteratorType -> P3
+    java.util.Set libraryMethodsReturningNonNull -> d4
+    com.android.tools.r8.graph.DexType boxedNumberType -> h2
+    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> H3
     com.android.tools.r8.graph.DexString cloneMethodName -> f0
-    com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> F1
+    com.android.tools.r8.graph.DexString reflectiveOperationExceptionDescriptor -> F1
     com.android.tools.r8.graph.DexString endsWithMethodName -> X
     com.android.tools.r8.graph.DexString intDescriptor -> y
-    com.android.tools.r8.graph.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 initMethodName -> n0
+    com.android.tools.r8.graph.DexString charArrayDescriptor -> N1
+    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> s3
+    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> X2
+    com.android.tools.r8.graph.DexType annotationEnclosingClass -> y3
+    com.android.tools.r8.graph.DexString methodDescriptor -> V0
+    com.android.tools.r8.graph.DexString optionalDescriptor -> w1
     com.android.tools.r8.graph.DexString boxedIntDescriptor -> H
-    com.android.tools.r8.graph.DexType consumerType -> 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: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>
+    2:364:void <init>():65:427 -> <init>
+    365:413:void <init>():417:465 -> <init>
+    414:430:void <init>():455:471 -> <init>
+    431:449:void <init>():468:486 -> <init>
+    450:470:void <init>():477:497 -> <init>
+    471:503:void <init>():490:522 -> <init>
+    504:508:void <init>():521:525 -> <init>
+    509:512:void <init>():524:527 -> <init>
+    513:550:void <init>():518:555 -> <init>
+    551:553:void <init>():106:108 -> <init>
+    554:554:void <init>():107:107 -> <init>
     com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame lambda$createSetInlineFrame$4(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame) -> a
     1:1:com.android.tools.r8.graph.DexType access$1900(com.android.tools.r8.graph.DexItemFactory):61:61 -> a
     2:2:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> a
-    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):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
+    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):430:431 -> a
+    5:7:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):443:445 -> a
+    8:8:com.android.tools.r8.utils.Pair lambda$mapToPredicate$1(java.util.function.Predicate,com.android.tools.r8.graph.DexMethod):532:532 -> a
+    9:9:java.util.stream.Stream mapToPredicate(java.util.Set,java.util.function.Predicate):532:532 -> a
+    10:11:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1156:1157 -> a
     12:12:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> a
-    12:12:com.android.tools.r8.graph.DexItem canonicalize(java.util.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
+    12:12:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1157 -> a
+    13:14:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1157:1158 -> a
+    15:16:com.android.tools.r8.graph.DexString createString(int,byte[]):1163:1164 -> a
+    17:18:com.android.tools.r8.graph.DexString createString(java.lang.String):1168:1169 -> a
+    19:19:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$3(com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.dex.ClassesChecksum):1205:1205 -> a
+    20:21:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1231:1232 -> a
     22:22:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    22:22:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):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
+    22:22:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1232 -> a
+    23:23:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1232:1232 -> a
+    24:24:com.android.tools.r8.graph.DexType createType(java.lang.String):1223:1223 -> a
+    24:24:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1232 -> a
+    25:27:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):1236:1238 -> a
+    28:28:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1242:1242 -> a
+    29:31:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString):1246:1248 -> a
+    32:35:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1252:1255 -> a
+    36:41:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1321:1326 -> a
+    36:41:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1256 -> a
+    42:42:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1253:1253 -> a
+    43:43:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):1260:1260 -> a
+    44:44:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1270:1270 -> a
     45:45:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    45:45:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):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
+    45:45:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1270 -> a
+    46:47:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1270:1271 -> a
     48:48:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    48:48:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):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
+    48:48:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1273 -> a
+    49:51:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1272:1274 -> a
+    52:56:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1287:1291 -> a
+    57:64:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1308:1315 -> a
+    57:64:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1291 -> a
     65:74:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.copyWithSparseChanges(java.lang.Class,java.lang.Object[],java.util.Map):25:34 -> a
-    65:74:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):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
+    65:74:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1317 -> a
+    65:74:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1291 -> a
+    75:75:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1317:1317 -> a
+    75:75:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1291 -> a
+    76:82:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1292:1298 -> a
+    83:87:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1297:1301 -> a
+    88:90:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):1330:1332 -> a
+    91:91:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> a
+    92:94:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):1343:1345 -> a
+    95:96:com.android.tools.r8.graph.DexCallSite createCallSite(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):1354:1355 -> a
+    97:106:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString[]):1363:1372 -> a
+    107:109:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):1376:1378 -> a
+    110:112:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):1414:1416 -> a
+    113:115:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):1421:1423 -> a
+    116:116:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):1431:1431 -> a
+    117:119:void clearTypeLatticeElementsCache():1435:1437 -> a
+    120:127:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1464:1471 -> a
+    128:156:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1470:1498 -> a
+    157:165:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1478:1486 -> a
+    166:177:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1485:1496 -> a
+    178:179:java.util.Set getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1503:1504 -> a
+    180:181:java.util.Set lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1507:1508 -> a
+    182:186:void assignSortedIndices(java.util.Collection,com.android.tools.r8.naming.NamingLens):1515:1519 -> a
+    187:187:int lambda$assignSortedIndices$7(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):1516:1516 -> a
+    188:194:void sort(com.android.tools.r8.naming.NamingLens):1524:1530 -> a
+    195:195:void forAllTypes(java.util.function.Consumer):1547:1547 -> a
+    1:7:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1209:1215 -> b
+    8:10:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1214:1216 -> b
     11:11:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> b
-    11:11:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):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
+    11:11:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1216 -> b
+    12:13:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1216:1217 -> b
+    14:14:com.android.tools.r8.graph.DexType createType(java.lang.String):1223:1223 -> b
+    15:17:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):1382:1384 -> b
+    18:18:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():1406:1406 -> b
+    19:19:boolean isConstructor(com.android.tools.r8.graph.DexMethod):1427:1427 -> b
+    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):566:566 -> c
+    2:2:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1173:1173 -> c
+    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):1227:1227 -> c
+    4:6:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):1388:1390 -> c
+    7:7:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():1410:1410 -> c
+    1:2:com.android.tools.r8.dex.ClassesChecksum extractChecksum():1204:1205 -> d
+    3:3:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$2(com.android.tools.r8.graph.DexString):1204:1204 -> d
+    4:6:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):1394:1396 -> d
+    1:5:java.util.Collection extractMarker():1179:1183 -> e
+    6:8:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):1400:1402 -> e
+    1:5:java.util.List extractMarkers():1193:1197 -> f
+    1:1:boolean getSkipNameValidationForTesting():562:562 -> g
+    1:10:void resetSortedIndices():1534:1543 -> h
+    1:3:boolean verifyNoCachedTypeLatticeElements():1441:1443 -> i
+    1:12:java.util.Set boxedValueOfMethods():440:451 -> j
 com.android.tools.r8.graph.DexItemFactory$1 -> com.android.tools.r8.C.C0:
 com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods -> com.android.tools.r8.C.D0:
     com.android.tools.r8.graph.DexMethod initMessageAndCause -> b
     com.android.tools.r8.graph.DexMethod initMessage -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):615:615 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):619:624 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):616:616 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):620:625 -> <init>
 com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods -> com.android.tools.r8.C.E0:
     java.util.Set updaters -> d
     com.android.tools.r8.graph.DexMethod referenceUpdater -> c
     com.android.tools.r8.graph.DexMethod longUpdater -> b
     com.android.tools.r8.graph.DexMethod intUpdater -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):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
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):830:830 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):836:855 -> <init>
+    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):859:859 -> a
 com.android.tools.r8.graph.DexItemFactory$ClassMethods -> com.android.tools.r8.C.F0:
     com.android.tools.r8.graph.DexMethod newInstance -> l
     com.android.tools.r8.graph.DexMethod getDeclaredMethod -> k
@@ -18492,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):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
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):659:659 -> <init>
+    2:31:void <init>(com.android.tools.r8.graph.DexItemFactory):676:705 -> <init>
+    1:1:java.util.Set access$1700(com.android.tools.r8.graph.DexItemFactory$ClassMethods):659:659 -> a
+    2:2:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):709:709 -> a
+    1:1:boolean isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):713:713 -> b
 com.android.tools.r8.graph.DexItemFactory$ConstructorMethods -> com.android.tools.r8.C.G0:
     com.android.tools.r8.graph.DexMethod newInstance -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):716:716 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):720:722 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):717:717 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):721:723 -> <init>
 com.android.tools.r8.graph.DexItemFactory$EnumMethods -> com.android.tools.r8.C.H0:
     com.android.tools.r8.graph.DexMethod toString -> d
     com.android.tools.r8.graph.DexMethod name -> c
     com.android.tools.r8.graph.DexMethod ordinal -> b
     com.android.tools.r8.graph.DexMethod valueOf -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):730:730 -> <init>
-    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):737:757 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):731:731 -> <init>
+    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):738:758 -> <init>
 com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods -> com.android.tools.r8.C.I0:
     com.android.tools.r8.graph.DexMethod asList -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):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>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):579:579 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):583:587 -> <init>
+    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):585:585 -> <init>
 com.android.tools.r8.graph.DexItemFactory$LongMethods -> com.android.tools.r8.C.J0:
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):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>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):569:569 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):573:575 -> <init>
+    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):574:574 -> <init>
 com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.C.K0:
     com.android.tools.r8.graph.DexMethod init -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):765:765 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):769:771 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):766:766 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):770:772 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ObjectMethods -> com.android.tools.r8.C.L0:
     com.android.tools.r8.graph.DexMethod toString -> d
     com.android.tools.r8.graph.DexMethod finalize -> c
     com.android.tools.r8.graph.DexMethod constructor -> b
     com.android.tools.r8.graph.DexMethod getClass -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):629:629 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.DexItemFactory):636:643 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):630:630 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.DexItemFactory):637:644 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> com.android.tools.r8.C.M0:
     com.android.tools.r8.graph.DexMethod requireNonNull -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):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>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):649:649 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):653:655 -> <init>
+    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):654:654 -> <init>
 com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.C.N0:
     com.android.tools.r8.graph.DexProto compareAndSetSignature -> c
     java.util.Set varHandleMethods -> d
@@ -18541,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):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
+    1:36:void <init>(com.android.tools.r8.graph.DexItemFactory):1044:1079 -> <init>
+    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):1087:1097 -> a
+    12:17:java.util.Set createStrings(java.lang.String[]):1104:1109 -> a
 com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> com.android.tools.r8.C.O0:
     com.android.tools.r8.graph.DexField longTYPE -> f
     com.android.tools.r8.graph.DexField intTYPE -> e
@@ -18554,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):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
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):786:786 -> <init>
+    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):798:818 -> <init>
+    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):822:822 -> a
 com.android.tools.r8.graph.DexItemFactory$ProxyMethods -> com.android.tools.r8.C.P0:
     com.android.tools.r8.graph.DexMethod newProxyInstance -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):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>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1113:1113 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1117:1122 -> <init>
+    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1119:1119 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> com.android.tools.r8.C.Q0:
     com.android.tools.r8.graph.DexMethod iterator -> d
     com.android.tools.r8.graph.DexMethod loadInstalled -> c
     com.android.tools.r8.graph.DexMethod loadWithClassLoader -> b
     com.android.tools.r8.graph.DexMethod load -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):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
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1126:1126 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1133:1139 -> <init>
+    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1137:1145 -> <init>
+    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1142:1147 -> <init>
+    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):1151:1151 -> a
 com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> com.android.tools.r8.C.R0:
     com.android.tools.r8.graph.DexMethod defaultConstructor -> o
     com.android.tools.r8.graph.DexMethod charSequenceConstructor -> n
@@ -18594,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>():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
+    1:1:void <clinit>():936:936 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):936:936 -> <init>
+    2:46:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):960:1004 -> <init>
+    1:1:java.util.Set access$1600(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):936:936 -> a
+    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):1009:1009 -> a
+    3:7:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1013:1017 -> a
     8:8:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    8:8:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1014 -> a
-    9:25:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1017:1033 -> a
+    8:8:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1017 -> a
+    9:25:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1020:1036 -> a
     26:26:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    26:26:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):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
+    26:26:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1036 -> a
+    27:27:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1039:1039 -> a
+    1:1:java.util.Set access$1800(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):936:936 -> b
 com.android.tools.r8.graph.DexItemFactory$StringMethods -> com.android.tools.r8.C.S0:
     com.android.tools.r8.graph.DexMethod hashCode -> o
     com.android.tools.r8.graph.DexMethod compareToIgnoreCase -> n
@@ -18623,21 +18658,24 @@
     com.android.tools.r8.graph.DexMethod contains -> c
     com.android.tools.r8.graph.DexMethod length -> b
     com.android.tools.r8.graph.DexMethod isEmpty -> a
+    com.android.tools.r8.graph.DexItemFactory this$0 -> t
+    com.android.tools.r8.graph.DexMethod trim -> s
     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):862:862 -> <init>
-    2:45:void <init>(com.android.tools.r8.graph.DexItemFactory):885:928 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):863:863 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):888:888 -> <init>
+    3:48:void <init>(com.android.tools.r8.graph.DexItemFactory):886:931 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> com.android.tools.r8.C.T0:
     com.android.tools.r8.graph.DexMethod initCause -> d
     com.android.tools.r8.graph.DexMethod getSuppressed -> c
     com.android.tools.r8.graph.DexMethod getMessage -> b
     com.android.tools.r8.graph.DexMethod addSuppressed -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):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>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):593:593 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):600:602 -> <init>
+    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):601:604 -> <init>
+    9:16:void <init>(com.android.tools.r8.graph.DexItemFactory):603:610 -> <init>
+    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):608:608 -> <init>
 com.android.tools.r8.graph.DexLibraryClass -> com.android.tools.r8.C.V0:
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():17:17 -> <clinit>
@@ -18646,10 +18684,10 @@
     boolean isLibraryClass() -> S
     boolean isNotProgramClass() -> X
     1:1:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):74:74 -> a
-    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():119:119 -> a
+    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():118:118 -> a
     2:2:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):74 -> a
     3:3:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> a
-    3:3:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():119 -> a
+    3:3:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():118 -> a
     3:3:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):74 -> a
     4:5:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):74:75 -> a
     6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):82:82 -> a
@@ -18684,39 +18722,42 @@
     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
     2:2:boolean match(com.android.tools.r8.graph.DexItem):12:12 -> a
-    3:3:int slowCompareTo(java.lang.Object):12:12 -> a
-    4:6:boolean collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):52:54 -> a
-    4:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):45 -> a
-    7:7:void collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):62:62 -> a
-    7:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):46 -> a
-    8:8:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):231:231 -> a
-    8:8:void collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):62 -> a
+    3:3:boolean match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    3:3:boolean match(com.android.tools.r8.graph.DexItem):12 -> a
+    4:4:int slowCompareTo(java.lang.Object):12:12 -> a
+    5:7:boolean collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):52:54 -> a
+    5:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):45 -> a
+    8:8:void collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):62:62 -> a
     8:8:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):46 -> a
-    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):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
-    22:22:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):143 -> a
-    23:23:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):147:147 -> a
-    24:24:int com.android.tools.r8.graph.DexProto.compareTo(com.android.tools.r8.graph.DexProto):63:63 -> a
-    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):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
-    28:28:boolean match(com.android.tools.r8.graph.DexEncodedMethod):157 -> a
-    29:29:void setSingleVirtualMethodCache(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):200:200 -> a
-    30:30:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
-    30:30:void setSingleVirtualMethodCache(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):201 -> a
-    31:33:void setSingleVirtualMethodCache(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):201:203 -> a
-    34:35:com.android.tools.r8.graph.DexEncodedMethod getSingleVirtualMethodCache(com.android.tools.r8.graph.DexType):211:212 -> a
+    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 -> a
+    9:9:void collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):62 -> a
+    9:9:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):46 -> a
+    10:10:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):67:67 -> a
+    11:11:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):139:139 -> a
+    12:12:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
+    12:12:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):139 -> a
+    13:13:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):143:143 -> a
+    14:14:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):241:241 -> a
+    14:14:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):143 -> a
+    15:15:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):147:147 -> a
+    16:16:int com.android.tools.r8.graph.DexProto.compareTo(com.android.tools.r8.graph.DexProto):63:63 -> a
+    16:16:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):147 -> 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.DexMethod,com.android.tools.r8.naming.NamingLens):143 -> a
+    18:18:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
+    18:18:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):139 -> a
+    19:19:boolean match(com.android.tools.r8.graph.DexMethod):152:152 -> a
+    20:20:void setSingleVirtualMethodCache(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):200:200 -> a
+    21:21:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
+    21:21:void setSingleVirtualMethodCache(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):201 -> a
+    22:24:void setSingleVirtualMethodCache(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):201:203 -> a
+    25:25:com.android.tools.r8.graph.DexEncodedMethod getSingleVirtualMethodCache(com.android.tools.r8.graph.DexType):211:211 -> a
+    26:26:boolean isSingleVirtualMethodCached(com.android.tools.r8.graph.DexType):207:207 -> a
+    26:26:com.android.tools.r8.graph.DexEncodedMethod getSingleVirtualMethodCache(com.android.tools.r8.graph.DexType):211 -> a
+    27:28:com.android.tools.r8.graph.DexEncodedMethod getSingleVirtualMethodCache(com.android.tools.r8.graph.DexType):211:212 -> a
     1:5:boolean computeEquals(java.lang.Object):89:93 -> b
-    6:6:boolean isSingleVirtualMethodCached(com.android.tools.r8.graph.DexType):207:207 -> b
+    6:14:int slowCompareTo(com.android.tools.r8.graph.DexMethod):113:121 -> b
+    15:15:boolean isSingleVirtualMethodCached(com.android.tools.r8.graph.DexType):207:207 -> b
     1:1:int compareTo(java.lang.Object):12:12 -> compareTo
     2:2:int compareTo(com.android.tools.r8.graph.DexMethod):108:108 -> compareTo
     2:2:int compareTo(java.lang.Object):12 -> compareTo
@@ -18986,7 +19027,7 @@
     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:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):150:150 -> d0
     13:13:void computeStaticValues():302 -> d0
     14:16:void computeStaticValues():308:310 -> d0
     1:1:com.android.tools.r8.graph.DexMethod lambda$sortEncodedMethods$1(com.android.tools.r8.graph.DexEncodedMethod):378:378 -> e
@@ -19238,19 +19279,19 @@
 com.android.tools.r8.graph.DexValue -> com.android.tools.r8.C.I1:
     com.android.tools.r8.graph.DexValue$UnknownDexValue UNKNOWN -> b
     com.android.tools.r8.graph.DexValue[] EMPTY_ARRAY -> a
-    1:3:void <clinit>():26:28 -> <clinit>
-    1:1:void <init>():25:25 -> <init>
-    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) -> a
+    1:3:void <clinit>():28:30 -> <clinit>
+    1:1:void <init>():27:27 -> <init>
+    com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo) -> a
     void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping) -> a
-    1:22:com.android.tools.r8.graph.DexValue fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):59:80 -> a
-    23:36:com.android.tools.r8.graph.DexValue fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):74:87 -> a
-    37:37:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):98:98 -> a
-    38:58:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):115:135 -> a
-    59:75:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):117:133 -> a
-    76:76:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):127:127 -> a
-    77:83:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):125:131 -> a
-    84:84:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):121:121 -> a
-    85:85:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):119:119 -> a
+    1:22:com.android.tools.r8.graph.DexValue fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):61:82 -> a
+    23:36:com.android.tools.r8.graph.DexValue fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):76:89 -> a
+    37:37:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):100:100 -> a
+    38:58:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):117:137 -> a
+    59:75:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):119:135 -> a
+    76:76:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):129:129 -> a
+    77:83:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):127:133 -> a
+    84:84:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):123:123 -> a
+    85:85:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):121:121 -> a
     java.lang.Object asAsmEncodedObject() -> h
     com.android.tools.r8.graph.DexValue$DexValueMethodHandle asDexValueMethodHandle() -> i
     com.android.tools.r8.graph.DexValue$DexValueMethodType asDexValueMethodType() -> j
@@ -19261,285 +19302,298 @@
 com.android.tools.r8.graph.DexValue$DexItemBasedValueString -> com.android.tools.r8.C.m1:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> d
-    1:1:void <clinit>():752:752 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):757:758 -> <init>
-    1:1:void com.android.tools.r8.graph.DexValue$NestedDexValue.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):688:688 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):752 -> a
-    2:6: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):777:781 -> a
-    7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):787:787 -> a
-    1:1:boolean equals(java.lang.Object):752:752 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():767:767 -> h
-    1:1:int hashCode():752:752 -> hashCode
-    1:1:java.lang.Object getBoxedValue():752:752 -> k
+    1:1:void <clinit>():776:776 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):781:782 -> <init>
+    1:1:void com.android.tools.r8.graph.DexValue$NestedDexValue.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):709:709 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):776 -> a
+    2:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):802:809 -> a
+    10:10:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):817:817 -> a
+    1:1:boolean equals(java.lang.Object):776:776 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():791:791 -> h
+    1:1:int hashCode():776:776 -> hashCode
+    1:1:java.lang.Object getBoxedValue():776:776 -> k
     void sort() -> m
     byte getValueKind() -> n
-    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():762:762 -> o
-    1:1:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():662:662 -> p
+    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():786:786 -> o
+    1:1:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():683:683 -> p
     1:1:com.android.tools.r8.graph.IndexedDexItem getValue():0 -> p
-    1:1:java.lang.String toString():752:752 -> toString
+    1:1:java.lang.String toString():776:776 -> toString
 com.android.tools.r8.graph.DexValue$DexValueAnnotation -> com.android.tools.r8.C.n1:
     com.android.tools.r8.graph.DexEncodedAnnotation value -> c
-    1:2:void <init>(com.android.tools.r8.graph.DexEncodedAnnotation):958:959 -> <init>
-    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    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):970 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):971:971 -> a
-    3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):965:965 -> a
+    1:2:void <init>(com.android.tools.r8.graph.DexEncodedAnnotation):988:989 -> <init>
+    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    1:1:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1000 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1001:1001 -> a
+    3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):995:995 -> a
     4:5:void com.android.tools.r8.graph.DexEncodedAnnotation.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):29:30 -> a
-    4:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):965 -> a
-    1:3:boolean equals(java.lang.Object):999:1001 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():981:981 -> h
-    1:1:int hashCode():991:991 -> hashCode
-    1:1:java.lang.Object getBoxedValue():976:976 -> k
-    1:1:void sort():986:986 -> m
-    1:1:java.lang.String toString():1008:1008 -> toString
+    4:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):995 -> a
+    1:3:boolean equals(java.lang.Object):1029:1031 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():1011:1011 -> h
+    1:1:int hashCode():1021:1021 -> hashCode
+    1:1:java.lang.Object getBoxedValue():1006:1006 -> k
+    1:1:void sort():1016:1016 -> m
+    1:1:java.lang.String toString():1038:1038 -> toString
 com.android.tools.r8.graph.DexValue$DexValueArray -> com.android.tools.r8.C.o1:
     com.android.tools.r8.graph.DexValue[] values -> c
-    1:2:void <init>(com.android.tools.r8.graph.DexValue[]):891:892 -> <init>
-    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    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):907 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):908:908 -> a
+    1:2:void <init>(com.android.tools.r8.graph.DexValue[]):921:922 -> <init>
+    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    1:1:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):937 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):938:938 -> a
     3:3:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):908 -> a
-    4:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):909:910 -> a
-    6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):902:902 -> a
-    1:3:boolean equals(java.lang.Object):941:943 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():921:921 -> h
-    1:1:int hashCode():933:933 -> hashCode
-    1:1:java.lang.Object getBoxedValue():916:916 -> k
-    1:2:void sort():926:927 -> m
-    1:1:com.android.tools.r8.graph.DexValue[] getValues():896:896 -> n
-    1:1:java.lang.String toString():950:950 -> toString
+    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):938 -> a
+    4:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):939:940 -> a
+    6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):932:932 -> a
+    1:3:boolean equals(java.lang.Object):971:973 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():951:951 -> h
+    1:1:int hashCode():963:963 -> hashCode
+    1:1:java.lang.Object getBoxedValue():946:946 -> k
+    1:2:void sort():956:957 -> m
+    1:1:com.android.tools.r8.graph.DexValue[] getValues():926:926 -> n
+    1:1:java.lang.String toString():980:980 -> toString
 com.android.tools.r8.graph.DexValue$DexValueBoolean -> com.android.tools.r8.C.p1:
     com.android.tools.r8.graph.DexValue$DexValueBoolean TRUE -> d
     com.android.tools.r8.graph.DexValue$DexValueBoolean FALSE -> e
     com.android.tools.r8.graph.DexValue$DexValueBoolean DEFAULT -> f
     boolean value -> c
-    1:4:void <clinit>():1068:1071 -> <clinit>
-    1:2:void <init>(boolean):1075:1076 -> <init>
+    1:4:void <clinit>():1096:1099 -> <clinit>
+    1:2:void <init>(boolean):1103:1104 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean create(boolean):1080:1080 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1094:1094 -> a
-    3:3:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    3:3:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):25 -> a
-    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1094 -> a
-    4:4: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):1122:1122 -> a
-    1:1:boolean equals(java.lang.Object):1112:1112 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():1099:1099 -> h
-    1:1:int hashCode():1104:1104 -> hashCode
-    1:1:boolean getValue():1084:1084 -> k
-    1:1:java.lang.Object getBoxedValue():1089 -> k
-    2:2:java.lang.Object getBoxedValue():1089:1089 -> k
+    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean create(boolean):1108:1108 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1122:1122 -> a
+    3:3:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    3:3:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1122 -> a
+    4:4:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1151:1151 -> a
+    1:1:boolean equals(java.lang.Object):1140:1140 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():1127:1127 -> h
+    1:1:int hashCode():1132:1132 -> hashCode
+    1:1:boolean getValue():1112:1112 -> k
+    1:1:java.lang.Object getBoxedValue():1117 -> k
+    2:2:java.lang.Object getBoxedValue():1117:1117 -> k
     boolean mayHaveSideEffects() -> l
     void sort() -> m
-    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean access$000():1066:1066 -> n
-    1:1:java.lang.String toString():1117:1117 -> toString
+    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean access$000():1094:1094 -> n
+    1:1:java.lang.String toString():1145:1145 -> toString
 com.android.tools.r8.graph.DexValue$DexValueByte -> com.android.tools.r8.C.q1:
     byte value -> c
     com.android.tools.r8.graph.DexValue$DexValueByte DEFAULT -> d
-    1:1:void <clinit>():253:253 -> <clinit>
-    1:2:void <init>(byte):257:258 -> <init>
+    1:1:void <clinit>():257:257 -> <clinit>
+    1:2:void <init>(byte):261:262 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    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):276 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):277:277 -> a
+    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    1:1:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):280 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):281:281 -> a
     3:3:int com.android.tools.r8.dex.DexOutputBuffer.putSignedEncodedValue(long,int):88:88 -> a
-    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):277 -> a
-    4:4:com.android.tools.r8.graph.DexValue$DexValueByte create(byte):262:262 -> a
-    5: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):305:305 -> a
-    1:1:boolean equals(java.lang.Object):295:295 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():282:282 -> h
-    1:1:int hashCode():287:287 -> hashCode
-    1:1:byte getValue():266:266 -> k
-    1:1:java.lang.Object getBoxedValue():271 -> k
-    2:2:java.lang.Object getBoxedValue():271:271 -> k
+    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):281 -> a
+    4:4:com.android.tools.r8.graph.DexValue$DexValueByte create(byte):266:266 -> a
+    5:5:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):310:310 -> a
+    1:1:boolean equals(java.lang.Object):299:299 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():286:286 -> h
+    1:1:int hashCode():291:291 -> hashCode
+    1:1:byte getValue():270:270 -> k
+    1:1:java.lang.Object getBoxedValue():275 -> k
+    2:2:java.lang.Object getBoxedValue():275:275 -> k
     boolean mayHaveSideEffects() -> l
     void sort() -> m
-    1:1:java.lang.String toString():300:300 -> toString
+    1:1:java.lang.String toString():304:304 -> toString
 com.android.tools.r8.graph.DexValue$DexValueChar -> com.android.tools.r8.C.r1:
     com.android.tools.r8.graph.DexValue$DexValueChar DEFAULT -> d
     char value -> c
-    1:1:void <clinit>():367:367 -> <clinit>
-    1:2:void <init>(char):370:371 -> <init>
+    1:1:void <clinit>():373:373 -> <clinit>
+    1:2:void <init>(char):376:377 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueChar create(char):375:375 -> a
-    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):389:390 -> a
+    1:1:com.android.tools.r8.graph.DexValue$DexValueChar create(char):381:381 -> a
+    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):395:396 -> a
     4:4:int com.android.tools.r8.dex.DexOutputBuffer.putUnsignedEncodedValue(long,int):92:92 -> a
-    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):390 -> a
+    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):396 -> a
     5:5:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):391 -> a
-    6:6:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    6:6:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):25 -> a
-    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):392 -> a
-    7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):393:393 -> 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):421:421 -> a
-    1:1:boolean equals(java.lang.Object):411:411 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():398:398 -> h
-    1:1:int hashCode():403:403 -> hashCode
-    1:1:char getValue():379:379 -> k
-    1:1:java.lang.Object getBoxedValue():384 -> k
-    2:2:java.lang.Object getBoxedValue():384:384 -> k
+    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):397 -> a
+    6:6:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    6:6:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):398 -> a
+    7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):399:399 -> a
+    8:8:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):428:428 -> a
+    1:1:boolean equals(java.lang.Object):417:417 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():404:404 -> h
+    1:1:int hashCode():409:409 -> hashCode
+    1:1:char getValue():385:385 -> k
+    1:1:java.lang.Object getBoxedValue():390 -> k
+    2:2:java.lang.Object getBoxedValue():390:390 -> k
     boolean mayHaveSideEffects() -> l
     void sort() -> m
-    1:1:java.lang.String toString():416:416 -> toString
+    1:1:java.lang.String toString():422:422 -> toString
 com.android.tools.r8.graph.DexValue$DexValueDouble -> com.android.tools.r8.C.s1:
     com.android.tools.r8.graph.DexValue$DexValueDouble DEFAULT -> d
     double value -> c
-    1:1:void <clinit>():596:596 -> <clinit>
-    1:2:void <init>(double):600:601 -> <init>
+    1:1:void <clinit>():611:611 -> <clinit>
+    1:2:void <init>(double):615:616 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueDouble create(double):605:605 -> a
-    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):619:620 -> a
+    1:1:com.android.tools.r8.graph.DexValue$DexValueDouble create(double):620:620 -> a
+    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):634:635 -> a
     4:4:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):621 -> a
-    5:5:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    5:5:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):25 -> a
-    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):622 -> a
-    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):623:623 -> a
-    1:2:boolean equals(java.lang.Object):641:642 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():628:628 -> h
-    1:1:int hashCode():633:633 -> hashCode
-    1:1:double getValue():609:609 -> k
-    1:1:java.lang.Object getBoxedValue():614 -> k
-    2:2:java.lang.Object getBoxedValue():614:614 -> k
+    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):636 -> a
+    5:5:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    5:5:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):637 -> a
+    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):638:638 -> a
+    7:7:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):649:649 -> a
+    8:9:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createDoubleConstant(double,com.android.tools.r8.graph.DebugLocalInfo):1012:1013 -> a
+    8:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):649 -> a
+    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createDoubleConstant(double,com.android.tools.r8.graph.DebugLocalInfo):1012:1012 -> a
+    10:10:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):649 -> a
+    1:2:boolean equals(java.lang.Object):662:663 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():643:643 -> h
+    1:1:int hashCode():654:654 -> hashCode
+    1:1:double getValue():624:624 -> k
+    1:1:java.lang.Object getBoxedValue():629 -> k
+    2:2:java.lang.Object getBoxedValue():629:629 -> k
     boolean mayHaveSideEffects() -> l
     void sort() -> m
-    1:1:double getValue():609:609 -> n
-    1:1:java.lang.String toString():647:647 -> toString
+    1:1:double getValue():624:624 -> n
+    1:1:java.lang.String toString():668:668 -> toString
 com.android.tools.r8.graph.DexValue$DexValueEnum -> com.android.tools.r8.C.t1:
-    1:1:void <init>(com.android.tools.r8.graph.DexField):849:849 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):846:846 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):860:860 -> a
-    1:1:boolean equals(java.lang.Object):846:846 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():846:846 -> h
-    1:1:int hashCode():846:846 -> hashCode
-    1:1:java.lang.Object getBoxedValue():846:846 -> k
+    1:1:void <init>(com.android.tools.r8.graph.DexField):879:879 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):876:876 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):890:890 -> a
+    1:1:boolean equals(java.lang.Object):876:876 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():876:876 -> h
+    1:1:int hashCode():876:876 -> hashCode
+    1:1:java.lang.Object getBoxedValue():876:876 -> k
     void sort() -> m
     byte getValueKind() -> n
-    1:1:java.lang.String toString():846:846 -> toString
+    1:1:java.lang.String toString():876:876 -> toString
 com.android.tools.r8.graph.DexValue$DexValueField -> com.android.tools.r8.C.u1:
-    1:1:void <init>(com.android.tools.r8.graph.DexField):813:813 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):810:810 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):824:824 -> a
-    1:1:boolean equals(java.lang.Object):810:810 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():810:810 -> h
-    1:1:int hashCode():810:810 -> hashCode
-    1:1:java.lang.Object getBoxedValue():810:810 -> k
+    1:1:void <init>(com.android.tools.r8.graph.DexField):843:843 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):840:840 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):854:854 -> a
+    1:1:boolean equals(java.lang.Object):840:840 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():840:840 -> h
+    1:1:int hashCode():840:840 -> hashCode
+    1:1:java.lang.Object getBoxedValue():840:840 -> k
     void sort() -> m
     byte getValueKind() -> n
-    1:1:java.lang.String toString():810:810 -> toString
+    1:1:java.lang.String toString():840:840 -> toString
 com.android.tools.r8.graph.DexValue$DexValueFloat -> com.android.tools.r8.C.v1:
     float value -> c
     com.android.tools.r8.graph.DexValue$DexValueFloat DEFAULT -> d
-    1:1:void <clinit>():539:539 -> <clinit>
-    1:2:void <init>(float):542:543 -> <init>
+    1:1:void <clinit>():548:548 -> <clinit>
+    1:2:void <init>(float):551:552 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueFloat create(float):547:547 -> a
-    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):561:562 -> a
+    1:1:com.android.tools.r8.graph.DexValue$DexValueFloat create(float):556:556 -> a
+    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):570:571 -> a
     4:4:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):563 -> a
-    5:5:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    5:5:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):25 -> a
-    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):564 -> a
-    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):565:565 -> a
-    1:2:boolean equals(java.lang.Object):583:584 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():570:570 -> h
-    1:1:int hashCode():575:575 -> hashCode
-    1:1:float getValue():551:551 -> k
-    1:1:java.lang.Object getBoxedValue():556 -> k
-    2:2:java.lang.Object getBoxedValue():556:556 -> k
+    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):572 -> a
+    5:5:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    5:5:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):573 -> a
+    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):574:574 -> a
+    7:7:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):585:585 -> a
+    8:9:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createFloatConstant(float,com.android.tools.r8.graph.DebugLocalInfo):1017:1018 -> a
+    8:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):585 -> a
+    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createFloatConstant(float,com.android.tools.r8.graph.DebugLocalInfo):1017:1017 -> a
+    10:10:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):585 -> a
+    1:2:boolean equals(java.lang.Object):598:599 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():579:579 -> h
+    1:1:int hashCode():590:590 -> hashCode
+    1:1:float getValue():560:560 -> k
+    1:1:java.lang.Object getBoxedValue():565 -> k
+    2:2:java.lang.Object getBoxedValue():565:565 -> k
     boolean mayHaveSideEffects() -> l
     void sort() -> m
-    1:1:float getValue():551:551 -> n
-    1:1:java.lang.String toString():589:589 -> toString
+    1:1:float getValue():560:560 -> n
+    1:1:java.lang.String toString():604:604 -> toString
 com.android.tools.r8.graph.DexValue$DexValueInt -> com.android.tools.r8.C.w1:
     int value -> c
     com.android.tools.r8.graph.DexValue$DexValueInt DEFAULT -> d
-    1:1:void <clinit>():427:427 -> <clinit>
-    1:2:void <init>(int):430:431 -> <init>
+    1:1:void <clinit>():434:434 -> <clinit>
+    1:2:void <init>(int):437:438 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):449:449 -> a
-    2:2: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):477:477 -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueInt create(int):435:435 -> b
-    1:1:boolean equals(java.lang.Object):467:467 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():454:454 -> h
-    1:1:int hashCode():459:459 -> hashCode
-    1:1:int getValue():439:439 -> k
-    1:1:java.lang.Object getBoxedValue():444 -> k
-    2:2:java.lang.Object getBoxedValue():444:444 -> k
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):456:456 -> a
+    2:2:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):485:485 -> a
+    1:1:com.android.tools.r8.graph.DexValue$DexValueInt create(int):442:442 -> b
+    1:1:boolean equals(java.lang.Object):474:474 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():461:461 -> h
+    1:1:int hashCode():466:466 -> hashCode
+    1:1:int getValue():446:446 -> k
+    1:1:java.lang.Object getBoxedValue():451 -> k
+    2:2:java.lang.Object getBoxedValue():451:451 -> k
     boolean mayHaveSideEffects() -> l
     void sort() -> m
-    1:1:java.lang.String toString():472:472 -> toString
+    1:1:java.lang.String toString():479:479 -> toString
 com.android.tools.r8.graph.DexValue$DexValueLong -> com.android.tools.r8.C.x1:
     com.android.tools.r8.graph.DexValue$DexValueLong DEFAULT -> d
     long value -> c
-    1:1:void <clinit>():483:483 -> <clinit>
-    1:2:void <init>(long):486:487 -> <init>
+    1:1:void <clinit>():491:491 -> <clinit>
+    1:2:void <init>(long):494:495 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueLong create(long):491:491 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):505:505 -> a
-    3:3: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):533:533 -> a
-    1:1:boolean equals(java.lang.Object):523:523 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():510:510 -> h
-    1:1:int hashCode():515:515 -> hashCode
-    1:1:long getValue():495:495 -> k
-    1:1:java.lang.Object getBoxedValue():500 -> k
-    2:2:java.lang.Object getBoxedValue():500:500 -> k
+    1:1:com.android.tools.r8.graph.DexValue$DexValueLong create(long):499:499 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):513:513 -> a
+    3:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):542:542 -> a
+    4:5:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createLongConstant(long,com.android.tools.r8.graph.DebugLocalInfo):1031:1032 -> a
+    4:5:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):542 -> a
+    6:6:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createLongConstant(long,com.android.tools.r8.graph.DebugLocalInfo):1031:1031 -> a
+    6:6:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):542 -> a
+    1:1:boolean equals(java.lang.Object):531:531 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():518:518 -> h
+    1:1:int hashCode():523:523 -> hashCode
+    1:1:long getValue():503:503 -> k
+    1:1:java.lang.Object getBoxedValue():508 -> k
+    2:2:java.lang.Object getBoxedValue():508:508 -> k
     boolean mayHaveSideEffects() -> l
     void sort() -> m
-    1:1:long getValue():495:495 -> n
-    1:1:java.lang.String toString():528:528 -> toString
+    1:1:long getValue():503:503 -> n
+    1:1:java.lang.String toString():536:536 -> toString
 com.android.tools.r8.graph.DexValue$DexValueMethod -> com.android.tools.r8.C.y1:
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod):831:831 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):828:828 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):842:842 -> a
-    1:1:boolean equals(java.lang.Object):828:828 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():828:828 -> h
-    1:1:int hashCode():828:828 -> hashCode
-    1:1:java.lang.Object getBoxedValue():828:828 -> k
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod):861:861 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):858:858 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):872:872 -> a
+    1:1:boolean equals(java.lang.Object):858:858 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():858:858 -> h
+    1:1:int hashCode():858:858 -> hashCode
+    1:1:java.lang.Object getBoxedValue():858:858 -> k
     void sort() -> m
     byte getValueKind() -> n
-    1:1:java.lang.String toString():828:828 -> toString
+    1:1:java.lang.String toString():858:858 -> toString
 com.android.tools.r8.graph.DexValue$DexValueMethodHandle -> com.android.tools.r8.C.z1:
-    1:1:void <init>(com.android.tools.r8.graph.DexMethodHandle):1129:1129 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1126:1126 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):1145:1145 -> a
-    1:1:boolean equals(java.lang.Object):1126:1126 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():1126:1126 -> h
-    1:1:int hashCode():1126:1126 -> hashCode
+    1:1:void <init>(com.android.tools.r8.graph.DexMethodHandle):1158:1158 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1155:1155 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):1174:1174 -> a
+    1:1:boolean equals(java.lang.Object):1155:1155 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():1155:1155 -> h
+    1:1:int hashCode():1155:1155 -> hashCode
     com.android.tools.r8.graph.DexValue$DexValueMethodHandle asDexValueMethodHandle() -> i
-    1:1:java.lang.Object getBoxedValue():1126:1126 -> k
+    1:1:java.lang.Object getBoxedValue():1155:1155 -> k
     void sort() -> m
     byte getValueKind() -> n
-    1:1:java.lang.String toString():1126:1126 -> toString
+    1:1:java.lang.String toString():1155:1155 -> toString
 com.android.tools.r8.graph.DexValue$DexValueMethodType -> com.android.tools.r8.C.A1:
-    1:1:void <init>(com.android.tools.r8.graph.DexProto):867:867 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):864:864 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):883:883 -> a
-    1:1:boolean equals(java.lang.Object):864:864 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():864:864 -> h
-    1:1:int hashCode():864:864 -> hashCode
+    1:1:void <init>(com.android.tools.r8.graph.DexProto):897:897 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):894:894 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):913:913 -> a
+    1:1:boolean equals(java.lang.Object):894:894 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():894:894 -> h
+    1:1:int hashCode():894:894 -> hashCode
     com.android.tools.r8.graph.DexValue$DexValueMethodType asDexValueMethodType() -> j
-    1:1:java.lang.Object getBoxedValue():864:864 -> k
+    1:1:java.lang.Object getBoxedValue():894:894 -> k
     void sort() -> m
     byte getValueKind() -> n
-    1:1:java.lang.String toString():864:864 -> toString
+    1:1:java.lang.String toString():894:894 -> toString
 com.android.tools.r8.graph.DexValue$DexValueNull -> com.android.tools.r8.C.B1:
     com.android.tools.r8.graph.DexValue NULL -> c
-    1:1:void <clinit>():1014:1014 -> <clinit>
-    1:1:void <init>():1017:1017 -> <init>
+    1:1:void <clinit>():1044:1044 -> <clinit>
+    1:1:void <init>():1047:1047 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    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):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):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
+    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    1:1:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1056 -> a
+    2:3:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1055:1056 -> a
+    2:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1090 -> a
+    4:4:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1055:1055 -> a
+    4:4:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1090 -> a
+    1:1:boolean equals(java.lang.Object):1079:1079 -> equals
     java.lang.Object asAsmEncodedObject() -> h
     java.lang.Object getBoxedValue() -> k
     boolean mayHaveSideEffects() -> l
@@ -19547,92 +19601,92 @@
 com.android.tools.r8.graph.DexValue$DexValueShort -> com.android.tools.r8.C.C1:
     com.android.tools.r8.graph.DexValue$DexValueShort DEFAULT -> d
     short value -> c
-    1:1:void <clinit>():311:311 -> <clinit>
-    1:2:void <init>(short):314:315 -> <init>
+    1:1:void <clinit>():316:316 -> <clinit>
+    1:2:void <init>(short):319:320 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueShort create(short):319:319 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):333:333 -> a
-    3:3: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):361:361 -> a
-    1:1:boolean equals(java.lang.Object):351:351 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():338:338 -> h
-    1:1:int hashCode():343:343 -> hashCode
-    1:1:short getValue():323:323 -> k
-    1:1:java.lang.Object getBoxedValue():328 -> k
-    2:2:java.lang.Object getBoxedValue():328:328 -> k
+    1:1:com.android.tools.r8.graph.DexValue$DexValueShort create(short):324:324 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):338:338 -> a
+    3:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):367:367 -> a
+    1:1:boolean equals(java.lang.Object):356:356 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():343:343 -> h
+    1:1:int hashCode():348:348 -> hashCode
+    1:1:short getValue():328:328 -> k
+    1:1:java.lang.Object getBoxedValue():333 -> k
+    2:2:java.lang.Object getBoxedValue():333:333 -> k
     boolean mayHaveSideEffects() -> l
     void sort() -> m
-    1:1:java.lang.String toString():356:356 -> toString
+    1:1:java.lang.String toString():361:361 -> toString
 com.android.tools.r8.graph.DexValue$DexValueString -> com.android.tools.r8.C.D1:
-    1:1:void <init>(com.android.tools.r8.graph.DexString):722:722 -> <init>
-    1:1:void com.android.tools.r8.graph.DexValue$NestedDexValue.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):688:688 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):719 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):719:719 -> a
-    3: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):737:739 -> a
-    1:1:boolean equals(java.lang.Object):719:719 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():727:727 -> h
-    1:1:int hashCode():719:719 -> hashCode
-    1:1:java.lang.Object getBoxedValue():719:719 -> k
+    1:1:void <init>(com.android.tools.r8.graph.DexString):743:743 -> <init>
+    1:1:void com.android.tools.r8.graph.DexValue$NestedDexValue.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):709:709 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):740 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):740:740 -> a
+    3:7:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):759:763 -> a
+    1:1:boolean equals(java.lang.Object):740:740 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():748:748 -> h
+    1:1:int hashCode():740:740 -> hashCode
+    1:1:java.lang.Object getBoxedValue():740:740 -> k
     boolean mayHaveSideEffects() -> l
     void sort() -> m
     byte getValueKind() -> n
-    1:1:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():662:662 -> o
+    1:1:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():683:683 -> o
     1:1:com.android.tools.r8.graph.IndexedDexItem getValue():0 -> o
-    1:1:java.lang.String toString():719:719 -> toString
+    1:1:java.lang.String toString():740:740 -> toString
 com.android.tools.r8.graph.DexValue$DexValueType -> com.android.tools.r8.C.E1:
-    1:1:void <init>(com.android.tools.r8.graph.DexType):795:795 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):792:792 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):806:806 -> a
-    1:1:boolean equals(java.lang.Object):792:792 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():792:792 -> h
-    1:1:int hashCode():792:792 -> hashCode
-    1:1:java.lang.Object getBoxedValue():792:792 -> k
+    1:1:void <init>(com.android.tools.r8.graph.DexType):825:825 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):822:822 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):836:836 -> a
+    1:1:boolean equals(java.lang.Object):822:822 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():822:822 -> h
+    1:1:int hashCode():822:822 -> hashCode
+    1:1:java.lang.Object getBoxedValue():822:822 -> k
     void sort() -> m
     byte getValueKind() -> n
-    1:1:java.lang.String toString():792:792 -> toString
+    1:1:java.lang.String toString():822:822 -> toString
 com.android.tools.r8.graph.DexValue$NestedDexValue -> com.android.tools.r8.C.F1:
     com.android.tools.r8.graph.IndexedDexItem value -> c
-    1:1:void <init>(com.android.tools.r8.graph.IndexedDexItem,com.android.tools.r8.graph.DexValue$1):651:651 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.IndexedDexItem):655:656 -> <init>
-    1:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):667:668 -> a
+    1:1:void <init>(com.android.tools.r8.graph.IndexedDexItem,com.android.tools.r8.graph.DexValue$1):672:672 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.IndexedDexItem):676:677 -> <init>
+    1:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):688:689 -> a
     3:3:int com.android.tools.r8.dex.DexOutputBuffer.putUnsignedEncodedValue(long,int):92:92 -> a
-    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):669 -> a
+    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):690 -> a
     4:4:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):670 -> a
-    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):671:671 -> a
-    6:6:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    6:6:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):25 -> a
-    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):671 -> a
-    7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):672:672 -> a
-    1:3:boolean equals(java.lang.Object):706:708 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():682:682 -> h
-    1:1:int hashCode():698:698 -> hashCode
-    1:1:java.lang.Object getBoxedValue():677:677 -> k
+    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):691 -> a
+    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):692:692 -> a
+    6:6:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    6:6:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):692 -> a
+    7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):693:693 -> a
+    1:3:boolean equals(java.lang.Object):727:729 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():703:703 -> h
+    1:1:int hashCode():719:719 -> hashCode
+    1:1:java.lang.Object getBoxedValue():698:698 -> k
     byte getValueKind() -> n
-    1:1:java.lang.String toString():715:715 -> toString
+    1:1:java.lang.String toString():736:736 -> toString
 com.android.tools.r8.graph.DexValue$SimpleDexValue -> com.android.tools.r8.C.G1:
-    1:1:void <init>():222:222 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexValue$1):222:222 -> <init>
-    1:1:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):243:243 -> a
+    1:1:void <init>():226:226 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexValue$1):226:226 -> <init>
+    1:1:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):247:247 -> a
     2:2:int com.android.tools.r8.dex.DexOutputBuffer.putSignedEncodedValue(long,int):88:88 -> a
-    2:2:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):244 -> a
+    2:2:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):248 -> a
     3:3:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    3:3:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):245 -> a
-    4:4:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    4:4:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):25 -> a
-    4:4:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):246 -> a
-    5:5:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):247:247 -> a
+    3:3:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):249 -> a
+    4:4:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    4:4:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    4:4:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):250 -> a
+    5:5:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):251:251 -> a
 com.android.tools.r8.graph.DexValue$UnknownDexValue -> com.android.tools.r8.C.H1:
     com.android.tools.r8.graph.DexValue$UnknownDexValue UNKNOWN -> c
-    1:1:void <clinit>():165:165 -> <clinit>
-    1:1:void <init>():167:167 -> <init>
-    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) -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):173:173 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):188:188 -> a
-    1:1:java.lang.Object asAsmEncodedObject():198:198 -> h
-    1:1:int hashCode():203:203 -> hashCode
-    1:1:java.lang.Object getBoxedValue():193:193 -> k
+    1:1:void <clinit>():168:168 -> <clinit>
+    1:1:void <init>():170:170 -> <init>
+    com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo) -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):176:176 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):191:191 -> a
+    1:1:java.lang.Object asAsmEncodedObject():201:201 -> h
+    1:1:int hashCode():206:206 -> hashCode
+    1:1:java.lang.Object getBoxedValue():196:196 -> k
     boolean mayHaveSideEffects() -> l
-    1:1:void sort():178:178 -> m
+    1:1:void sort():181:181 -> m
 com.android.tools.r8.graph.DirectMappedDexApplication -> com.android.tools.r8.C.L1:
     com.android.tools.r8.com.google.common.collect.ImmutableList libraryClasses -> n
     com.android.tools.r8.com.google.common.collect.ImmutableList classpathClasses -> m
@@ -19750,24 +19804,25 @@
     15:15:void extendAccessesWithContexts(java.util.Map,java.util.function.Predicate,java.util.Map):101:101 -> a
     16:19:void lambda$extendAccessesWithContexts$6(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.DexField,java.util.Set):103:106 -> a
     20:20:java.util.Set lambda$extendAccessesWithContexts$5(com.android.tools.r8.graph.DexField):105:105 -> a
-    21:26:boolean recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):150:155 -> a
-    27:27:void clearWrites():172:172 -> a
-    28:40:com.android.tools.r8.graph.FieldAccessInfoImpl rewrittenWithLens(com.android.tools.r8.graph.GraphLense):176:188 -> a
-    41:42:void lambda$rewrittenWithLens$10(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexField,java.util.Set):183:184 -> a
+    21:23:boolean isWrittenOutside(com.android.tools.r8.graph.DexEncodedMethod):154:156 -> a
+    24:29:boolean recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):167:172 -> a
+    30:30:void clearWrites():189:189 -> a
+    31:43:com.android.tools.r8.graph.FieldAccessInfoImpl rewrittenWithLens(com.android.tools.r8.graph.GraphLense):193:205 -> a
+    44:45:void lambda$rewrittenWithLens$10(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexField,java.util.Set):200:201 -> a
     1:1:com.android.tools.r8.graph.DexField getField():46:46 -> b
     2:2:boolean lambda$forEachIndirectAccess$1(java.util.Set,com.android.tools.r8.graph.DexField):68:68 -> b
     3:3:boolean lambda$forEachIndirectAccessWithContexts$3(com.android.tools.r8.graph.DexField):90:90 -> b
     4:10:void forEachReadContext(java.util.function.Consumer):116:122 -> b
-    11:16:boolean recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):159:164 -> b
-    17:18:void lambda$rewrittenWithLens$12(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexField,java.util.Set):192:193 -> b
+    11:16:boolean recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):176:181 -> b
+    17:18:void lambda$rewrittenWithLens$12(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexField,java.util.Set):209:210 -> b
     1:4:com.android.tools.r8.graph.DexEncodedMethod getUniqueReadContext():51:54 -> c
     5:5:boolean lambda$forEachIndirectAccessWithContexts$4(com.android.tools.r8.graph.DexField):92:92 -> c
     1:1:boolean isRead():132:132 -> d
-    2:2:java.util.Set lambda$recordRead$7(com.android.tools.r8.graph.DexField):154:154 -> d
+    2:2:java.util.Set lambda$recordRead$7(com.android.tools.r8.graph.DexField):171:171 -> d
     1:1:boolean isWritten():146:146 -> e
-    2:2:java.util.Set lambda$recordWrite$8(com.android.tools.r8.graph.DexField):163:163 -> e
-    1:1:java.util.Set lambda$rewrittenWithLens$11(com.android.tools.r8.graph.DexField):192:192 -> f
-    1:1:java.util.Set lambda$rewrittenWithLens$9(com.android.tools.r8.graph.DexField):183:183 -> g
+    2:2:java.util.Set lambda$recordWrite$8(com.android.tools.r8.graph.DexField):180:180 -> e
+    1:1:java.util.Set lambda$rewrittenWithLens$11(com.android.tools.r8.graph.DexField):209:209 -> f
+    1:1:java.util.Set lambda$rewrittenWithLens$9(com.android.tools.r8.graph.DexField):200:200 -> g
 com.android.tools.r8.graph.GraphLense -> com.android.tools.r8.C.b2:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():50:50 -> <clinit>
@@ -20372,8 +20427,8 @@
     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():330:330 -> c
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1048 -> c
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> c
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1050 -> c
     9:9:boolean classRequiresCode():790 -> c
     9:9:void visitEnd():798 -> c
     10:12:boolean classRequiresCode():790:792 -> c
@@ -20509,7 +20564,7 @@
     9:11:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):324 -> a
     12:12:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):325:325 -> a
     13:14:com.android.tools.r8.graph.DexType createTypeFromInternalType(java.lang.String):386:387 -> a
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     15:15:com.android.tools.r8.graph.DexType createTypeFromInternalType(java.lang.String):387 -> a
     16:16:void visitInsn(int):553:553 -> a
     17:19:void visitInsn(int):421:423 -> a
@@ -20545,16 +20600,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):1220:1220 -> a
+    280:280:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     280:280:void visitTypeInsn(int,java.lang.String):665 -> a
     281:284:void visitTypeInsn(int,java.lang.String):677:680 -> a
     285:285:void visitTypeInsn(int,java.lang.String):674:674 -> a
     286:286:void visitTypeInsn(int,java.lang.String):671:671 -> a
     287:287:void visitTypeInsn(int,java.lang.String):668:668 -> a
     288:289:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):686:687 -> a
-    290:290:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    290:290:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     290:290:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):687 -> a
-    291:291:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1239:1239 -> a
+    291:291:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1242:1242 -> a
     291:291:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):687 -> a
     292:292:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):690:690 -> a
     293:293:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):695:695 -> a
@@ -20567,7 +20622,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):1220:1220 -> a
+    344:344:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     344:344:void visitLdcInsn(java.lang.Object):783 -> a
     345:362:void visitLdcInsn(java.lang.Object):783:800 -> a
     363:367:void visitLdcInsn(java.lang.Object):798:802 -> a
@@ -20578,13 +20633,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):1220:1220 -> a
+    384:384:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     384:384:void visitMultiANewArrayInsn(java.lang.String,int):833 -> a
     385:423:void visitMultiANewArrayInsn(java.lang.String,int):833:871 -> a
     424:424:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):879:879 -> a
     425:428:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):878:881 -> a
     429:432:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):887:890 -> a
-    433:433:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    433:433:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     433:433:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):891 -> a
     434:434:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):892:892 -> a
     435:441:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):888:894 -> a
@@ -20880,9 +20935,8 @@
     int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens) -> a
     int slowCompareTo(java.lang.Object) -> a
     1:1:boolean isSorted(java.util.List):15:15 -> a
-    2:2:boolean isSorted(java.lang.Object[],java.util.function.Function):19:19 -> a
-    3:5:boolean isSorted(java.util.List,java.util.function.Function):25:27 -> a
-    6:6:int slowCompare(com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):44:44 -> a
+    2:4:boolean isSorted(java.util.List,java.util.function.Function):25:27 -> a
+    5:5:int slowCompare(com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):44:44 -> a
 com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.C.D2:
     com.android.tools.r8.graph.DexApplication application -> a
     java.util.Set visited -> b
@@ -20901,9 +20955,8 @@
     void forEachTarget(java.util.function.Consumer) -> a
     boolean hasSingleTarget() -> a
     boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions) -> a
-    1:1:java.util.Set lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):33:33 -> a
-    2:3:void lambda$lookupVirtualTargets$0(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):50:51 -> a
-    4:64:java.util.Set lookupInterfaceTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):60:120 -> a
+    1:2:void lambda$lookupVirtualTargets$0(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):50:51 -> a
+    3:63:java.util.Set lookupInterfaceTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):60:120 -> a
     com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> b
     1:12:java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):37:48 -> b
     13:13:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):107:107 -> b
@@ -21050,18 +21103,18 @@
     49:55:void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod):36 -> a
     56:56:void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod):37:37 -> a
 com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.C.Q2.b:
-    1:1:void <init>():14:14 -> <init>
+    1:1:void <init>():13:13 -> <init>
     void done() -> a
     void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist) -> a
-    void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason) -> a
+    void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod) -> a
     void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod) -> a
 com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.C.Q2.e:
     java.util.Map mapping -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):59:59 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.AppView):56:60 -> <init>
-    1:17:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):65:81 -> a
-    18:18:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):79:79 -> a
+    1:17:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):65:81 -> a
+    18:18:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):79:79 -> a
     19:19:void done():87:87 -> a
 com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1 -> com.android.tools.r8.C.Q2.c:
 com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.C.Q2.d:
@@ -21335,16 +21388,16 @@
     113:122:boolean isSubsumedBy(com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.InstructionIterator,java.util.Set):133:142 -> a
     123:123:boolean isSubsumedBy(com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.InstructionIterator,java.util.Set):141:141 -> a
     124:130:boolean definesValueWithNonLocalUsages(com.android.tools.r8.ir.code.Instruction):159:165 -> a
-    131:131:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    131:131:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     131:131:boolean valuesAreIdentical(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):178 -> a
-    132:132:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    132:132:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     132:132:boolean valuesAreIdentical(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):179 -> a
     133:136:boolean valuesAreIdentical(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):183:186 -> a
     137:179:boolean instructionsDefineIdenticalValues(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):190:232 -> a
     137:179:boolean valuesAreIdentical(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):186 -> a
-    180:180:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    180:180:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     180:180:boolean valuesAreIdentical(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):179 -> a
-    181:181:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    181:181:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     181:181:boolean valuesAreIdentical(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):178 -> a
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.ir.code.Instruction):174:174 -> b
     1:1:boolean definesBlockLocalValue(com.android.tools.r8.ir.code.Instruction):155:155 -> c
@@ -21369,28 +21422,28 @@
     48:70:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):178:200 -> a
     48:70:boolean processValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.function.Predicate):141 -> a
     48:70:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
-    71:71:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    71:71:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     71:71:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):200 -> a
     71:71:boolean processValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.function.Predicate):141 -> a
     71:71:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
     72:72:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):201:201 -> a
     72:72:boolean processValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.function.Predicate):141 -> a
     72:72:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
-    73:73:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    73:73:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     73:73:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):200 -> a
     73:73:boolean processValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.function.Predicate):141 -> a
     73:73:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
     74:75:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):204:205 -> a
     74:75:boolean processValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.function.Predicate):141 -> a
     74:75:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
-    76:76:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    76:76:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     76:76:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):205 -> a
     76:76:boolean processValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.function.Predicate):141 -> a
     76:76:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
     77:77:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):206:206 -> a
     77:77:boolean processValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.function.Predicate):141 -> a
     77:77:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
-    78:78:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    78:78:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     78:78:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):205 -> a
     78:78:boolean processValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.function.Predicate):141 -> a
     78:78:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
@@ -21423,12 +21476,12 @@
     29:48:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52 -> a
     49:54:int computeBitsRead(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField):70:75 -> a
     49:54:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52 -> a
-    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     55:55:int computeBitsRead(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField):76 -> a
     55:55:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52 -> a
     56:60:int computeBitsRead(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField):77:81 -> a
     56:60:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52 -> a
-    61:61:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    61:61:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     61:61:int computeBitsRead(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField):76 -> a
     61:61:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52 -> a
     62:62:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52:52 -> a
@@ -21573,7 +21626,7 @@
     17:17:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):136 -> a
     17:17:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     17:17:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    18:18:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    18:18:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     18:18:void rewriteInfoArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):144 -> a
     18:18:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):136 -> a
     18:18:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -21600,7 +21653,7 @@
     25:32:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):137 -> a
     25:32:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     25:32:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    33:33:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    33:33:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     33:33:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):164 -> a
     33:33:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):137 -> a
     33:33:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -21678,11 +21731,6 @@
     2:2:boolean isDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod):83 -> a
     3:4:boolean isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.DexMethod):87:88 -> a
     1:1:boolean isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):92:92 -> b
-    2:2:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexMethod):152:152 -> b
-    2:2:boolean isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):92 -> b
-    3:3:boolean isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):92:92 -> b
-    4:4:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexMethod):152:152 -> b
-    4:4:boolean isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):92 -> b
 com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.D.a.q.e:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> b
     com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder decoder -> a
@@ -21695,10 +21743,10 @@
     1:1:void <clinit>():11:11 -> <clinit>
     boolean isProto2(int) -> a
     1:3:com.android.tools.r8.ir.code.Value getInfoValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):17:19 -> a
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     4:4:com.android.tools.r8.ir.code.Value getInfoValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):19 -> a
     1:3:com.android.tools.r8.ir.code.Value getObjectsValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):24:26 -> b
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     4:4:com.android.tools.r8.ir.code.Value getObjectsValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):26 -> b
 com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.D.a.q.j:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
@@ -21728,7 +21776,7 @@
     121:121:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo run(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):89 -> a
     122:122:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo run(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):184:184 -> a
     123:123:int invalidInfoFailure():236:236 -> a
-    124:124:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    124:124:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     124:124:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClass):191 -> a
     125:132:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClass):192:199 -> a
     133:134:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexClass.lookupUniqueInstanceFieldWithName(com.android.tools.r8.graph.DexString):541:542 -> a
@@ -21737,14 +21785,14 @@
     155:155:boolean com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo.isForFieldName():0:0 -> a
     155:155:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClass):212 -> a
     156:166:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClass):222:232 -> a
-    167:167:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    167:167:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     167:167:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClass):191 -> a
     168:176:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):300:308 -> a
-    177:177:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    177:177:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     177:177:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):308 -> a
     178:188:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):309:319 -> a
     189:189:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):312:312 -> a
-    190:190:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    190:190:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     190:190:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):308 -> a
     191:191:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):301:301 -> a
     1:1:com.android.tools.r8.ir.code.Value invalidObjectsFailure():240:240 -> b
@@ -21769,28 +21817,28 @@
     1:2:boolean hasNext():325:326 -> a
     3:4:boolean isArrayPutOfInterest(com.android.tools.r8.ir.code.Instruction):358:359 -> a
     3:4:boolean hasNext():327 -> a
-    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     5:5:boolean isArrayPutOfInterest(com.android.tools.r8.ir.code.Instruction):359 -> a
     5:5:boolean hasNext():327 -> a
     6:6:boolean isArrayPutOfInterest(com.android.tools.r8.ir.code.Instruction):359:359 -> a
     6:6:boolean hasNext():327 -> a
-    7:7:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    7:7:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     7:7:boolean isArrayPutOfInterest(com.android.tools.r8.ir.code.Instruction):359 -> a
     7:7:boolean hasNext():327 -> a
     8:11:boolean hasNext():330:333 -> a
     1:7:com.android.tools.r8.ir.code.Value next():340:346 -> b
     1:7:java.lang.Object next():319 -> b
-    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     8:8:com.android.tools.r8.ir.code.Value next():346 -> b
     8:8:java.lang.Object next():319 -> b
     9:16:com.android.tools.r8.ir.code.Value next():347:354 -> b
     9:16:java.lang.Object next():319 -> b
-    17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     17:17:com.android.tools.r8.ir.code.Value next():354 -> b
     17:17:java.lang.Object next():319 -> b
     18:18:com.android.tools.r8.ir.code.Value next():350:350 -> b
     18:18:java.lang.Object next():319 -> b
-    19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     19:19:com.android.tools.r8.ir.code.Value next():346 -> b
     19:19:java.lang.Object next():319 -> b
     20:20:com.android.tools.r8.ir.code.Value next():341:341 -> b
@@ -21826,7 +21874,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):959:959 -> a
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     2:2:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):34 -> a
     3:8:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):36:41 -> a
     boolean isLiveProtoFieldObject() -> e
@@ -21847,25 +21895,25 @@
     1:15:void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod):74:88 -> a
     16:32:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):93:109 -> a
     33:33:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):100:100 -> a
-    34:76:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):121:163 -> a
-    77:115:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):160:198 -> a
-    116:117:int com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getHazzerBitFieldIndex(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):134:135 -> a
-    116:117:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):199 -> a
-    118:130:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):200:212 -> a
-    131:131:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):211:211 -> a
-    132:132:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):135:135 -> a
-    133:138:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):224:229 -> a
-    133:138:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):217 -> a
-    139:188:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):236:285 -> a
-    189:189:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):284:284 -> a
-    190:190:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):251:251 -> a
-    191:202:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):295:306 -> a
-    203:208:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):318:323 -> a
-    203:208:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):307 -> a
-    209:222:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):322:335 -> a
-    209:222:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):307 -> a
-    223:245:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):344:366 -> a
-    246:246:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):354:354 -> a
+    34:77:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):121:164 -> a
+    78:116:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):161:199 -> a
+    117:118:int com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getHazzerBitFieldIndex(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):134:135 -> a
+    117:118:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):200 -> a
+    119:131:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):201:213 -> a
+    132:132:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):212:212 -> a
+    133:133:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):135:135 -> a
+    134:139:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):225:230 -> a
+    134:139:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):218 -> a
+    140:189:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):237:286 -> a
+    190:190:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):285:285 -> a
+    191:191:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):252:252 -> a
+    192:203:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):296:307 -> a
+    204:209:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):319:324 -> a
+    204:209:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):308 -> a
+    210:223:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):323:336 -> a
+    210:223:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):308 -> a
+    224:246:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):345:367 -> a
+    247:247:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):355:355 -> a
 com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.D.a.q.l.d:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType type -> b
     java.util.List objects -> d
@@ -21983,7 +22031,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):959:959 -> a
+    6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     6:6:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):28 -> a
     7:7:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):31:31 -> a
 com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.D.a.q.l.m:
@@ -21992,7 +22040,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):959:959 -> a
+    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     5:5:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):27 -> a
     6:6:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):29:29 -> a
 com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.D.a.q.l.n:
@@ -22019,15 +22067,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):973:973 -> a
+    2:2:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1045:1045 -> a
     2:2:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
     3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    3:3:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):973 -> a
+    3:3:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1045 -> a
     3:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):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.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    4:4:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1045 -> a
     4:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
-    5:5:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):974:974 -> a
+    5:5:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1046:1046 -> a
     5:5:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
     com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject asProtoTypeObject() -> c
     boolean isProtoTypeObject() -> g
@@ -22500,8 +22548,8 @@
     int requiredRegisters() -> y
 com.android.tools.r8.ir.code.Add -> com.android.tools.r8.D.b.a:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():127:127 -> G2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():127:127 -> H2
     boolean isAdd() -> O0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -22520,7 +22568,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):67:67 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):82:82 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):47:47 -> f
-    int opcode() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.AlwaysMaterializingDefinition -> com.android.tools.r8.D.b.b:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):18:18 -> <init>
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -22530,9 +22578,9 @@
     4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):40:40 -> a
     5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):46:46 -> a
     6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):66:66 -> a
-    1:1:int maxInValueRegister():56:56 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():56:56 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.AlwaysMaterializingNop -> com.android.tools.r8.D.b.c:
     1:1:void <init>():19:19 -> <init>
     boolean hasInvariantOutType() -> I0
@@ -22544,9 +22592,9 @@
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49:49 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):65:65 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:int maxInValueRegister():54:54 -> v2
-    1:1:int maxOutValueRegister():59:59 -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():54:54 -> w2
+    1:1:int maxOutValueRegister():59:59 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.AlwaysMaterializingUser -> com.android.tools.r8.D.b.d:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():15:15 -> <clinit>
@@ -22561,13 +22609,13 @@
     3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):66 -> a
     4:4:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):71:71 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:2:int maxInValueRegister():54:55 -> v2
-    1:1:int maxOutValueRegister():60:60 -> w2
-    int opcode() -> x2
+    1:2:int maxInValueRegister():54:55 -> w2
+    1:1:int maxOutValueRegister():60:60 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.And -> com.android.tools.r8.D.b.e:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):19:19 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():94:94 -> G2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():94:94 -> H2
     boolean isAnd() -> Q0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
@@ -22581,7 +22629,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):64:64 -> c
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):69:69 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):54:54 -> d
-    int opcode() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Argument -> com.android.tools.r8.D.b.f:
     boolean $assertionsDisabled -> i
     boolean knownToBeBoolean -> h
@@ -22602,14 +22650,14 @@
     6:6:boolean outTypeKnownToBeBoolean(java.util.Set):114:114 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.Argument asArgument() -> d
-    1:1:int maxInValueRegister():52:52 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():52:52 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ArithmeticBinop -> com.android.tools.r8.D.b.g:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):20:20 -> <init>
-    com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode() -> G2
+    com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode() -> H2
     boolean isArithmeticBinop() -> S0
     com.android.tools.r8.code.Instruction CreateDouble(int,int,int) -> a
     1:25:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:89 -> a
@@ -22635,10 +22683,10 @@
     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>
-    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 array():57:57 -> B2
-    1:1:com.android.tools.r8.ir.code.Value index():61:61 -> C2
+    boolean throwsOnNullInput() -> B2
+    1:1:com.android.tools.r8.ir.code.Value array():57:57 -> C2
+    1:1:com.android.tools.r8.ir.code.Value index():61:61 -> D2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     boolean isArrayGet() -> T0
@@ -22707,14 +22755,14 @@
     219:219:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):276:276 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> f
-    int maxInValueRegister() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ArrayLength -> com.android.tools.r8.D.b.i:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
-    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 throwsOnNullInput() -> B2
+    1:1:com.android.tools.r8.ir.code.Value array():42:42 -> C2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     boolean isArrayLength() -> U0
@@ -22740,19 +22788,19 @@
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):88:88 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> g
-    int maxInValueRegister() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ArrayPut -> com.android.tools.r8.D.b.j:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.MemberType type -> h
     1:1:void <clinit>():30:30 -> <clinit>
     1:5:void <init>(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):40:44 -> <init>
-    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 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 throwsOnNullInput() -> B2
+    1:1:com.android.tools.r8.ir.code.Value array():58:58 -> C2
+    1:1:com.android.tools.r8.ir.code.Value index():62:62 -> D2
+    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> E2
     boolean hasInvariantOutType() -> I0
     1:5:boolean instructionInstanceCanThrow():136:140 -> M0
     boolean instructionTypeCanThrow() -> N0
@@ -22781,36 +22829,36 @@
     111:111:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):271:271 -> a
     112:112:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):271:271 -> a
     1:7:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):150:156 -> b
-    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     8:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):156 -> b
     9:14:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):157:162 -> b
-    15:15:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    15:15:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     15:15:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):162 -> b
     16:20:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):163:167 -> b
-    21:21:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    21:21:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     21:21:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):167 -> b
     22:51:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):168:197 -> b
-    52:52:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    52:52:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     52:52:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):167 -> b
-    53:53:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    53:53:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     53:53:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):162 -> b
-    54:54:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    54:54:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     54:54:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):156 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> h
-    int maxInValueRegister() -> v2
-    1:1:int maxOutValueRegister():125:125 -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():125:125 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Assume -> com.android.tools.r8.D.b.p:
     com.android.tools.r8.ir.code.Instruction origin -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.Assume$Assumption assumption -> h
     1:1:void <clinit>():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 -> B2
-    1:1:com.android.tools.r8.ir.code.Instruction origin():85:85 -> C2
+    1:1:com.android.tools.r8.ir.code.Assume$Assumption getAssumption():77:77 -> C2
     boolean isIntroducingAnAlias() -> D1
-    1:1:com.android.tools.r8.ir.code.Value src():81:81 -> D2
+    1:1:com.android.tools.r8.ir.code.Instruction origin():85:85 -> D2
+    1:1:com.android.tools.r8.ir.code.Value src():81:81 -> E2
     boolean hasInvariantOutType() -> I0
     boolean isAssume() -> W0
     1:1:boolean isAssumeDynamicType():132:132 -> X0
@@ -22824,7 +22872,7 @@
     30:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):199:199 -> a
     31:31:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):204:204 -> a
     32:36:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):224:228 -> a
-    37:37:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forAssume():236:236 -> a
+    37:37:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forAssume():235:235 -> a
     37:37:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):234 -> a
     38:45:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):239:246 -> a
     46:46:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):240:240 -> a
@@ -22852,7 +22900,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() -> e2
+    boolean isOutConstant() -> f2
     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
@@ -22877,10 +22925,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 -> v2
     1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():194:194 -> w0
-    1:1:int maxOutValueRegister():214:214 -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():209:209 -> w2
+    1:1:int maxOutValueRegister():214:214 -> x2
+    int opcode() -> y2
     1:1:boolean isAssumeNone():119:119 -> z0
     1:1:java.lang.String getInstructionName():95 -> z0
     2:2:boolean isAssumeDynamicType():132:132 -> z0
@@ -22951,351 +22999,351 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap localsAtEntry -> a
     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
+    1:2:com.android.tools.r8.ir.code.BasicBlock getUniquePredecessor():229:230 -> A
+    1:2:boolean hasCatchHandlers():543:544 -> B
+    1:1:boolean hasIncompletePhis():1132:1132 -> C
+    1:1:boolean hasOneNormalExit():1518:1518 -> D
+    1:1:boolean hasPhis():527:527 -> E
+    1:1:boolean hasUniquePredecessor():225:225 -> F
+    1:2:void incrementUnfilledPredecessorCount():667:668 -> G
+    1:1:boolean isEmpty():612:612 -> H
+    1:1:boolean isFilled():535:535 -> I
+    1:1:boolean isSealed():1120:1120 -> J
+    1:11:boolean isSimpleAlwaysThrowingPath():1495:1505 -> K
+    1:1:boolean isTrivialGoto():1450:1450 -> L
+    1:1:com.android.tools.r8.ir.code.InstructionIterator iterator():1594:1594 -> M
+    1:1:int numberOfCatchHandlers():1543:1543 -> N
+    1:1:java.util.LinkedList getInstructions():570:570 -> O
+    1:1:int numberOfThrowingInstructions():1548 -> O
+    2:3:int numberOfThrowingInstructions():1548:1549 -> O
+    1:2:void removeAllNormalSuccessors():290:291 -> P
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> P
-    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
+    3:3:void removeAllNormalSuccessors():291 -> P
+    4:12:void removeAllNormalSuccessors():292:300 -> P
+    1:9:java.lang.String toDetailedString():1173:1181 -> Q
+    10:10:boolean isFilled():535:535 -> Q
+    10:10:java.lang.String toDetailedString():1181 -> Q
+    11:12:java.lang.String toDetailedString():1181:1182 -> Q
+    13:13:boolean isSealed():1120:1120 -> Q
+    13:13:java.lang.String toDetailedString():1182 -> Q
+    14:51:java.lang.String toDetailedString():1182:1219 -> Q
+    52:52:int digits(int):1169:1169 -> Q
+    52:52:java.lang.String toDetailedString():1219 -> Q
+    53:88:java.lang.String toDetailedString():1219:1254 -> Q
+    1:3:void unlinkCatchHandler():781:783 -> R
+    1:5:com.android.tools.r8.ir.code.BasicBlock unlinkSinglePredecessor():742:746 -> S
+    1:5:void unlinkSinglePredecessorSiblingsAllowed():752:756 -> T
+    1:6:com.android.tools.r8.ir.code.BasicBlock unlinkSingleSuccessor():765:770 -> U
+    1:2:boolean verifyFilledPredecessors():682:683 -> V
+    1:2:boolean notifyPredecessorsMayChangeListeners():243:244 -> 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
+    9:17:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):266:274 -> a
+    18:18:java.util.List getPhis():531:531 -> a
+    18:18:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):275 -> a
+    19:27:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):275:283 -> a
     28:28:void com.android.tools.r8.ir.code.Phi.removeTrivialPhi():227:227 -> 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):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):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):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):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):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():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):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):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):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):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):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
+    28:28:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):284 -> a
+    29:46:void swapSuccessorsByIndex(int,int):313:330 -> a
+    47:54:void replacePredecessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):445:452 -> a
+    55:63:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):456:464 -> a
+    64:64:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180:180 -> a
+    64:64:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):464 -> a
+    65:83:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):464:482 -> a
+    84:84:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180:180 -> a
+    84:84:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):484 -> a
+    85:101:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):484:500 -> a
+    102:102:java.util.LinkedList getInstructions():570:570 -> a
+    102:102:boolean consistentBlockInstructions(boolean,boolean):65 -> a
+    103:109:boolean consistentBlockInstructions(boolean,boolean):65:71 -> a
+    110:110:java.util.List getPredecessors():234:234 -> a
+    110:110:boolean consistentBlockInstructions(boolean,boolean):72 -> a
+    111:113:boolean consistentBlockInstructions(boolean,boolean):72:74 -> a
+    114:118:boolean consistentBlockInstructions(boolean,boolean):73:77 -> a
+    119:119:java.util.LinkedList getInstructions():570:570 -> a
+    119:119:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98 -> a
+    120:121:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98:99 -> a
+    122:122:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    122:122:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):99 -> a
+    123:123:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):100:100 -> a
+    124:124:java.lang.Iterable instructionsAfter(com.android.tools.r8.ir.code.Instruction):574:574 -> a
+    125:126:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):643:644 -> a
+    127:129:void clearMark(int):656:658 -> a
+    130:130:void addPhi(com.android.tools.r8.ir.code.Phi):688:688 -> a
+    131:131:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):702:702 -> a
+    132:132:boolean isFilled():535:535 -> a
+    132:132:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):702 -> a
+    133:136:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):702:705 -> a
+    137:137:void close(com.android.tools.r8.ir.conversion.IRBuilder):709:709 -> a
+    138:138:boolean isFilled():535:535 -> a
+    138:138:void close(com.android.tools.r8.ir.conversion.IRBuilder):709 -> a
+    139:143:void close(com.android.tools.r8.ir.conversion.IRBuilder):709:713 -> a
+    144:144:boolean com.android.tools.r8.ir.code.JumpInstruction.isJumpInstruction():0:0 -> a
+    144:144:void close(com.android.tools.r8.ir.conversion.IRBuilder):713 -> a
+    145:145:void close(com.android.tools.r8.ir.conversion.IRBuilder):714:714 -> a
+    146:147:boolean verifyNoValuesAfterThrowingInstruction():1580:1581 -> a
+    146:147:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
+    148:148:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1598:1598 -> a
+    148:148:boolean verifyNoValuesAfterThrowingInstruction():1581 -> a
+    148:148:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
+    149:154:boolean verifyNoValuesAfterThrowingInstruction():1582:1587 -> a
+    149:154:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
+    155:155:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    155:155:boolean verifyNoValuesAfterThrowingInstruction():1587 -> a
+    155:155:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
+    156:156:boolean verifyNoValuesAfterThrowingInstruction():1587:1587 -> a
+    156:156:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
+    157:157:void close(com.android.tools.r8.ir.conversion.IRBuilder):715:715 -> a
+    158:169:void filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1079:1090 -> a
+    158:169:void close(com.android.tools.r8.ir.conversion.IRBuilder):716 -> a
+    170:170:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):796:796 -> a
+    171:175:boolean isCatchHandlerForSingleGuard():822:826 -> a
+    171:175:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):797 -> a
+    176:180:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):799:803 -> a
+    181:181:boolean lambda$removeCatchHandlerWithGuard$6(int,com.android.tools.r8.ir.code.BasicBlock):814:814 -> a
+    182:191:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):843:852 -> a
+    192:201:void linkCatchSuccessors(java.util.List,java.util.List):891:900 -> a
+    202:214:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):904:916 -> a
+    215:218:int numberOfNormalSuccessors():218:221 -> a
+    215:218:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):917 -> a
+    219:232:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):922:935 -> a
+    233:243:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLense):946:956 -> a
+    244:245:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1006:1007 -> a
+    244:245:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1019 -> a
+    246:248:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1021:1023 -> a
+    249:267:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1044:1062 -> a
+    268:272:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1069:1073 -> a
+    273:276:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1072:1075 -> a
+    277:278:com.android.tools.r8.ir.code.BasicBlock$EdgeType getEdgeType(com.android.tools.r8.ir.code.BasicBlock):1095:1096 -> a
+    279:283:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1124:1128 -> a
+    284:291:void appendBasicBlockList(java.lang.StringBuilder,java.util.List,java.util.function.Function):1141:1148 -> a
+    292:295:void printDebugValueSet(java.lang.String,java.util.List,java.lang.StringBuilder):1258:1261 -> a
+    296:328:void print(com.android.tools.r8.utils.CfgPrinter):1266:1298 -> a
+    329:330:void printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1302:1303 -> a
+    331:343:void removeInstructions(java.util.List):1324:1336 -> a
+    344:344:void setInstructions(java.util.LinkedList):1316:1316 -> a
+    344:344:void removeInstructions(java.util.List):1337 -> a
+    345:346:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):1361:1362 -> a
+    347:351:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1375:1379 -> a
+    352:358:com.android.tools.r8.ir.code.BasicBlock createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.Instruction[]):1410:1416 -> a
+    359:359:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1432:1432 -> a
+    360:360:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    360:360:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1432 -> a
+    361:369:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1433:1441 -> a
+    370:370:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
+    370:370:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1442 -> a
+    371:371:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
+    371:371:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1443 -> a
+    372:373:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1444:1445 -> a
+    374:375:boolean canThrow():1557:1558 -> a
+    376:376:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1606:1606 -> a
+    377:377:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1610:1610 -> a
+    377:377:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1606 -> a
+    378:378:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1610:1610 -> a
+    379:379:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1614:1614 -> a
+    380:380:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1625:1625 -> a
+    381:386:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1643:1648 -> a
+    387:387:java.util.List getSuccessors():188:188 -> a
+    387:387:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1649 -> a
+    388:393:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1649:1654 -> a
+    394:399:void moveCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1675:1680 -> a
+    394:399:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1658 -> a
+    400:404:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1662:1666 -> a
+    405:421:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1691:1707 -> a
+    422:431:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1726:1735 -> a
+    422:431:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    432:432:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    432:432:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1736 -> a
+    432:432:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    433:435:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1736:1738 -> a
+    433:435:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    436:436:java.util.LinkedList getInstructions():570:570 -> a
+    436:436:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1739 -> a
+    436:436:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    437:454:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1739:1756 -> a
+    437:454:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    455:455:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
+    455:455:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1757 -> a
+    455:455:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    456:459:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1758:1761 -> a
+    456:459:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    460:460:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
+    460:460:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1762 -> a
+    460:460:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    461:466:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1763:1768 -> a
+    461:466:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    467:467:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746:1746 -> a
+    467:467:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    468:468:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    468:468:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746 -> a
+    468:468:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    469:503:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746:1780 -> a
+    469:503:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    504:504:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):130:130 -> a
+    504:504:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1782 -> a
+    504:504:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    505:505:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    505:505:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1783 -> a
+    505:505:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    506:506:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1783:1783 -> a
+    506:506:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    507:507:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1726:1726 -> a
+    507:507:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    1:1:void lambda$notifyPredecessorsMayChangeListeners$2(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):244:244 -> b
+    2:30:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):335:363 -> b
+    31:31:java.util.LinkedList getInstructions():570:570 -> b
+    31:31:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):365 -> b
+    32:32:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):365:365 -> 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):360 -> b
-    34:34:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):360:360 -> b
+    33:33:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):367 -> b
+    34:34:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):367:367 -> 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):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
+    35:35:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):368 -> b
+    36:39:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):368:371 -> b
+    40:40:java.util.List getPredecessors():234:234 -> b
+    40:40:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):432 -> b
+    40:40:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):371 -> b
+    41:41:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):432:432 -> b
+    41:41:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):371 -> b
+    42:42:java.util.List getPredecessors():234:234 -> b
+    42:42:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):435 -> b
+    42:42:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):371 -> b
+    43:44:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):435:436 -> b
+    43:44:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):371 -> b
+    45:50:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):371:376 -> b
+    51:51:java.util.LinkedList getInstructions():570:570 -> b
+    51:51:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):377 -> b
+    52:61:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):377:386 -> b
+    62:62:java.util.LinkedList getInstructions():570:570 -> b
+    62:62:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):387 -> b
+    63:99:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):387:423 -> b
+    100:101:void removePhisByIndex(java.util.List):521:522 -> b
+    102:102:java.lang.Iterable instructionsBefore(com.android.tools.r8.ir.code.Instruction):578:578 -> b
+    103:104:void decrementUnfilledPredecessorCount(int):672:673 -> b
+    105:106:void removePhi(com.android.tools.r8.ir.code.Phi):692:693 -> b
+    107:116:void removeCatchHandlerWithGuard(com.android.tools.r8.graph.DexType):808:817 -> b
+    117:118:java.util.Set cleanForRemoval():857:858 -> b
+    119:119:java.util.List getPhis():531:531 -> b
+    119:119:java.util.Set cleanForRemoval():859 -> b
+    120:127:java.util.Set cleanForRemoval():859:866 -> b
+    128:128:java.util.List getPhis():531:531 -> b
+    128:128:java.util.Set cleanForRemoval():867 -> b
+    129:132:java.util.Set cleanForRemoval():867:870 -> b
+    133:133:java.util.List getPhis():531:531 -> b
+    133:133:java.util.Set cleanForRemoval():873 -> b
+    134:134:java.util.Set cleanForRemoval():873:873 -> b
+    135:135:java.util.LinkedList getInstructions():570:570 -> b
+    135:135:java.util.Set cleanForRemoval():874 -> b
+    136:136:java.util.Set cleanForRemoval():874:874 -> 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
+    137:137:java.util.Set cleanForRemoval():875 -> b
+    138:138:java.util.Set cleanForRemoval():876:876 -> 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
+    139:139:java.util.Set cleanForRemoval():877 -> b
+    140:147:java.util.Set cleanForRemoval():877:884 -> b
+    148:149:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1006:1007 -> b
+    148:149:boolean isOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1013 -> b
+    150:153:boolean hasCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1100:1103 -> 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
+    2:6:void swapSuccessors(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):305:309 -> c
+    7:8:boolean isMarked(int):662:663 -> c
+    9:9:boolean blocksClean(java.util.List):728:728 -> c
+    10:10:void clearCatchHandlers():1534:1534 -> c
+    11:11:com.android.tools.r8.ir.code.InstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1602:1602 -> c
+    12:21:boolean hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1884:1893 -> 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
+    22:22:boolean hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1894 -> c
+    23:25:boolean hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1894:1896 -> c
+    1:4:void link(com.android.tools.r8.ir.code.BasicBlock):721:724 -> d
+    5:5:void clearCurrentDefinitions():992:992 -> d
+    6:6:java.util.List getPhis():531:531 -> d
+    6:6:void clearCurrentDefinitions():993 -> d
+    7:8:void clearCurrentDefinitions():993:994 -> d
+    9:11:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1345:1347 -> d
+    12:12:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1598:1598 -> d
+    1:3:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):260:262 -> 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):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
+    4:4:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):262 -> e
+    5:5:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):262:262 -> e
+    6:7:void clearUserInfo():638:639 -> e
+    8:11:void mark(int):649:652 -> e
+    12:12:com.android.tools.r8.ir.code.InstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1602:1602 -> e
+    12:12:java.util.Iterator lambda$instructionsAfter$3(com.android.tools.r8.ir.code.Instruction):574 -> e
+    1:2:int numberInstructions(int):562:563 -> f
+    3:3:java.util.Iterator lambda$instructionsBefore$4(com.android.tools.r8.ir.code.Instruction):579:579 -> f
+    4:5:boolean consistentCatchHandlers():963:964 -> f
+    6:6:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlersWithSuccessorIndexes():1530:1530 -> f
+    6:6:boolean consistentCatchHandlers():965 -> f
+    7:8:boolean consistentCatchHandlers():967:968 -> f
+    9:15:boolean consistentCatchHandlers():967:973 -> 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
+    16:16:boolean consistentCatchHandlers():973 -> f
+    17:26:boolean consistentCatchHandlers():973:982 -> 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
+    27:27:boolean consistentCatchHandlers():983 -> f
+    28:31:boolean consistentCatchHandlers():983:986 -> f
+    32:33:void transferCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1538:1539 -> f
+    1:2:void setNumber(int):553:554 -> g
+    3:4:void decrementUnfilledPredecessorCount():677:678 -> g
+    5:40:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1800:1835 -> g
+    41:41:java.util.List getPredecessors():234:234 -> g
+    41:41:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1835 -> g
+    42:43:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1835:1836 -> g
+    44:44:java.util.List getPhis():531:531 -> g
+    44:44:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1836 -> g
+    45:64:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1836:1855 -> g
+    65:65:java.util.List getPredecessors():234:234 -> g
+    65:65:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1855 -> g
+    66:70:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1855:1859 -> g
+    71:71:java.util.List getPredecessors():234:234 -> g
+    71:71:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1859 -> g
+    72:87:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1859:1874 -> g
     int onThrowValueRegister(int) -> h
-    1:2:void lambda$blocksClean$5(com.android.tools.r8.ir.code.BasicBlock):723:724 -> h
-    3:17:void deduplicatePhis():1892:1906 -> h
+    1:2:void lambda$blocksClean$5(com.android.tools.r8.ir.code.BasicBlock):730:731 -> h
+    3:17:void deduplicatePhis():1927:1941 -> 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:4:void detachAllSuccessors():835:838 -> i
+    5:6:boolean verifyOnThrowWrite(int):1570:1571 -> i
+    1:2:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1162:1163 -> j
+    3:11:int guardsForCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1107:1115 -> j
+    3:11:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1163 -> j
+    12:12:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1163:1163 -> j
+    13:15:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1478:1480 -> j
+    1:1:com.android.tools.r8.ir.code.Instruction entry():616:616 -> k
+    1:2:com.android.tools.r8.ir.code.Instruction exceptionalExit():626:627 -> l
+    3:3:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1598:1598 -> l
+    3:3:com.android.tools.r8.ir.code.Instruction exceptionalExit():627 -> l
+    4:6:com.android.tools.r8.ir.code.Instruction exceptionalExit():628:630 -> l
+    1:3:com.android.tools.r8.ir.code.JumpInstruction exit():620:622 -> m
+    1:5:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlers():1522:1526 -> n
+    1:1:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlersWithSuccessorIndexes():1530:1530 -> o
+    1:1:java.util.LinkedList getInstructions():570:570 -> p
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getLocalsAtEntry():94:94 -> q
-    1:2:java.util.List getMutablePredecessors():231:232 -> r
+    1:2:java.util.List getMutablePredecessors():238:239 -> 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:7:java.util.List getNormalPredecessors():250:256 -> t
+    1:1:java.lang.String toString():1154:1154 -> 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:2:int getNumber():548:549 -> v
+    1:1:java.lang.String getNumberAsString():558:558 -> w
+    1:1:java.util.List getPhis():531:531 -> x
+    1:1:java.util.List getPredecessors():234:234 -> y
     1:1:java.util.List getSuccessors():188:188 -> z
 com.android.tools.r8.ir.code.BasicBlock$1 -> com.android.tools.r8.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
+    1:4:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):579:582 -> <init>
+    1:3:com.android.tools.r8.ir.code.Instruction advance():585:587 -> f
+    1:1:boolean hasNext():596:596 -> hasNext
+    1:5:com.android.tools.r8.ir.code.Instruction next():601:605 -> next
+    1:5:java.lang.Object next():579 -> next
+    6:6:com.android.tools.r8.ir.code.Instruction next():603:603 -> next
+    6:6:java.lang.Object next():579 -> next
 com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener -> com.android.tools.r8.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
@@ -23305,24 +23353,24 @@
     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>():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):1885 -> a
-    7:7:int doHash(java.lang.Object):1869 -> a
+    1:1:void <clinit>():1904:1904 -> <clinit>
+    1:1:void <init>():1904:1904 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.BasicBlock$1):1904:1904 -> <init>
+    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):1904:1904 -> a
+    2:4:boolean doEquivalent(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi):1907:1909 -> a
+    2:4:boolean doEquivalent(java.lang.Object,java.lang.Object):1904 -> a
+    5:5:int doHash(java.lang.Object):1904:1904 -> a
+    6:6:int doHash(com.android.tools.r8.ir.code.Phi):1919:1919 -> a
+    6:6:int doHash(java.lang.Object):1904 -> a
+    7:7:int com.android.tools.r8.ir.code.Value.hashCode():764:764 -> a
+    7:7:int doHash(com.android.tools.r8.ir.code.Phi):1920 -> a
+    7:7:int doHash(java.lang.Object):1904 -> a
 com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo -> com.android.tools.r8.D.b.u:
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo CAN_THROW -> b
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo NO_THROW -> a
     1:2:void <clinit>():104:105 -> <clinit>
     1:1:void <init>(java.lang.String,int):103:103 -> <init>
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     1:1:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):108 -> a
     2:2:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):108:108 -> a
 com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.D.b.w:
@@ -23371,117 +23419,125 @@
     26:29:com.android.tools.r8.ir.code.Value insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):205:208 -> a
     30:30:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
     30:30:com.android.tools.r8.ir.code.Value insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):209 -> a
-    31:34:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):214:217 -> a
-    35:35:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    35:35:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):218 -> a
-    36:59:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):228:251 -> a
-    60:60:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    60:60:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):251 -> a
-    61:74:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):251:264 -> a
-    75:75:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):229:229 -> a
-    76:85:void lambda$replaceCurrentInstructionWithThrowNull$1(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.BasicBlock):266:275 -> a
-    86:93:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):283:290 -> a
-    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():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
-    101:105:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):297:301 -> a
-    106:107:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> a
-    106:107:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):301 -> a
-    108:126:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):302:320 -> a
-    127:132:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):329:334 -> a
-    133:133:java.lang.Object next():28:28 -> a
-    133:133:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):334 -> a
-    134:134:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):336:336 -> a
-    135:167:void splitBlockAndCopyCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):362:394 -> a
-    168:171:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):432:435 -> a
-    172:172:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    172:172:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):435 -> a
-    173:174:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):435:436 -> a
-    175:175:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    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():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
-    186:187:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.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
-    188:205:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):460:477 -> a
-    206:206:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    206:206:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):477 -> a
-    207:214:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):477:484 -> a
-    215:215:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    215:215:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):487 -> a
-    216:219:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.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
-    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):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
-    240:240:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):508 -> a
-    241:246:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):509:514 -> a
-    247:247:void add(java.lang.Object):28:28 -> a
-    247:247:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):514 -> a
-    248:254:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):518:524 -> a
-    255:255:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    255:255:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):528 -> a
-    256: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):528:532 -> a
-    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):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
-    285:285:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):554 -> a
-    286:287:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):555:556 -> a
-    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):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
-    294:294:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):561 -> a
-    295:304:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.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:569 -> a
-    305:305:java.lang.Object next():28:28 -> a
-    305:305:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):569 -> a
-    306:307:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):570:571 -> a
-    308:308:boolean hasNext():57:57 -> a
-    308:308:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):571 -> a
-    309:316:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):571:578 -> a
-    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):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):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
-    388:391:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):641:644 -> a
-    392:392:java.lang.Object previous():28:28 -> a
-    392:392:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):644 -> a
-    393:413:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):647:667 -> a
-    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):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
-    428:428:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):683 -> a
-    429:435:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):684:690 -> a
+    31:54:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):228:251 -> a
+    55:55:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
+    55:55:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):251 -> a
+    56:69:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):251:264 -> a
+    70:70:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):229:229 -> a
+    71:80:void lambda$replaceCurrentInstructionWithThrowNull$1(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.BasicBlock):266:275 -> a
+    81:88:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):283:290 -> a
+    89:89:boolean hasNext():57:57 -> a
+    89:89:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):290 -> a
+    90:93:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):290:293 -> a
+    94:94:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
+    94:94:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):293 -> a
+    95:95:boolean hasPrevious():73:73 -> a
+    95:95:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):297 -> a
+    96:100:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):297:301 -> a
+    101:102:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> a
+    101:102:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):301 -> a
+    103:121:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):302:320 -> a
+    122:127:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):329:334 -> a
+    128:128:java.lang.Object next():28:28 -> a
+    128:128:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):334 -> a
+    129:129:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):336:336 -> a
+    130:162:void splitBlockAndCopyCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):362:394 -> a
+    163:166:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):432:435 -> a
+    167:167:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    167:167:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):435 -> a
+    168:169:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):435:436 -> a
+    170:170:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    170:170:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):436 -> a
+    171:172:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):436:437 -> a
+    173:179:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):448:454 -> a
+    180:180:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
+    180:180:boolean canThrow(com.android.tools.r8.ir.code.IRCode):342 -> a
+    180:180:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):456 -> a
+    181:182:boolean canThrow(com.android.tools.r8.ir.code.IRCode):343:344 -> a
+    181:182:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):456 -> a
+    183:200:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):460:477 -> a
+    201:201:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
+    201:201:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):477 -> a
+    202:209:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):477:484 -> a
+    210:210:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
+    210:210:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):487 -> a
+    211:214:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):487:490 -> a
+    215:215:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    215:215:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):489 -> a
+    216:216:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):491:491 -> a
+    217:217:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    217:217:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):492 -> a
+    218:231:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):492:505 -> a
+    232:232:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.InstructionListIterator.split(com.android.tools.r8.ir.code.IRCode):99:99 -> a
+    232:232:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):505 -> a
+    233:235:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):506:508 -> a
+    236:236:void add(java.lang.Object):28:28 -> a
+    236:236:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):508 -> a
+    237:242:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):509:514 -> a
+    243:243:void add(java.lang.Object):28:28 -> a
+    243:243:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):514 -> a
+    244:250:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):518:524 -> a
+    251:251:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
+    251:251:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):528 -> a
+    252:256:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):528:532 -> a
+    257:257:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
+    257:257:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):533 -> a
+    258:265:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):533:540 -> a
+    266:266:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    266:266:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):540 -> a
+    267:280:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):540:553 -> a
+    281:281:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    281:281:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):554 -> a
+    282:283:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):555:556 -> a
+    284:284:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    284:284:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):557 -> a
+    285:287:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):557:559 -> a
+    288:288:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    288:288:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):559 -> a
+    289:289:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):562:562 -> a
+    290:290:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    290:290:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):561 -> a
+    291:291:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):560:560 -> a
+    292:292:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.InstructionListIterator.split(com.android.tools.r8.ir.code.IRCode):99:99 -> a
+    292:292:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):566 -> a
+    293:295:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):567:569 -> a
+    296:296:java.lang.Object next():28:28 -> a
+    296:296:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):569 -> a
+    297:298:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):570:571 -> a
+    299:299:boolean hasNext():57:57 -> a
+    299:299:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):571 -> a
+    300:307:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):571:578 -> a
+    308:308:java.lang.Object next():28:28 -> a
+    308:308:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):578 -> a
+    309:323:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):579:593 -> a
+    324:324:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):946:946 -> a
+    324:324:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):593 -> a
+    325:338:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):596:609 -> a
+    339:355:void appendCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):409:425 -> a
+    339:355:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):610 -> a
+    356:361:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):617:622 -> a
+    362:362:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    362:362:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):622 -> a
+    363:373:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):622:632 -> a
+    374:378:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):631:635 -> a
+    379:382:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):641:644 -> a
+    383:383:java.lang.Object previous():28:28 -> a
+    383:383:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):644 -> a
+    384:404:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):647:667 -> a
+    405:405:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):130:130 -> a
+    405:405:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):672 -> a
+    406:406:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):673:673 -> a
+    407:407:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    407:407:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):673 -> a
+    408:418:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):673:683 -> a
+    419:419:java.lang.Object previous():28:28 -> a
+    419:419:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):683 -> a
+    420:426:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):684:690 -> a
+    427:427:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    427:427:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):214 -> a
+    428:429:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):216:217 -> a
+    430:430:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    430:430:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):218 -> a
     1:1:void add(java.lang.Object):28:28 -> add
     1:7:void add(com.android.tools.r8.ir.code.Instruction):102:108 -> b
     1:7:void removeOrReplaceByDebugLocalRead():172:178 -> d
@@ -23546,15 +23602,15 @@
 com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.D.b.z:
     com.android.tools.r8.ir.code.NumericType type -> h
     1:8:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:31 -> <init>
-    1:1:com.android.tools.r8.ir.code.NumericType getNumericType():36:36 -> 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
+    1:1:com.android.tools.r8.ir.code.NumericType getNumericType():36:36 -> C2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.ir.code.Value leftValue():40:40 -> E2
+    1:2:int maxInOutValueRegisterSize():82:83 -> F2
+    1:1:com.android.tools.r8.ir.code.Value rightValue():44:44 -> G2
     boolean hasInvariantOutType() -> I0
     boolean isBinop() -> Z0
     1:8:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):51:58 -> a
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1254:1254 -> a
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1256:1256 -> a
     9:9:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58 -> a
     10:10:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58:58 -> a
     11:11:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forBinop():75:75 -> a
@@ -23570,8 +23626,8 @@
     1:3:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):64 -> g
     1:3:boolean fitsInLit8Instruction(com.android.tools.r8.ir.code.Value):74:76 -> h
     com.android.tools.r8.ir.code.Binop asBinop() -> l
-    1:1:int maxInValueRegister():90:90 -> v2
-    1:1:int maxOutValueRegister():95:95 -> w2
+    1:1:int maxInValueRegister():90:90 -> w2
+    1:1:int maxOutValueRegister():95:95 -> x2
 com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.D.b.A:
     java.util.Map canonicalPositions -> b
     boolean $assertionsDisabled -> e
@@ -23610,24 +23666,25 @@
     4:4:boolean hasCatchAll(com.android.tools.r8.graph.DexItemFactory):76 -> a
     5:5:boolean hasCatchAll(com.android.tools.r8.graph.DexItemFactory):76:76 -> a
     6:6:java.util.List getAllTargets():64:64 -> a
-    7:16:com.android.tools.r8.ir.code.CatchHandlers removeGuard(com.android.tools.r8.graph.DexType):80:89 -> a
-    17:18:void lambda$removeGuard$0(com.android.tools.r8.graph.DexType,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,java.lang.Object):85:86 -> a
-    19:20:void forEach(java.util.function.BiConsumer):93:94 -> a
+    7:10:com.android.tools.r8.ir.code.CatchHandlers appendGuard(com.android.tools.r8.graph.DexType,java.lang.Object):80:83 -> a
+    11:20:com.android.tools.r8.ir.code.CatchHandlers removeGuard(com.android.tools.r8.graph.DexType):87:96 -> a
+    21:22:void lambda$removeGuard$0(com.android.tools.r8.graph.DexType,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,java.lang.Object):92:93 -> a
+    23:24:void forEach(java.util.function.BiConsumer):100:101 -> a
     1:1:java.util.List access$100(com.android.tools.r8.ir.code.CatchHandlers):17:17 -> b
     2:2:java.util.List getGuards():60:60 -> b
     1:4:java.util.Set getUniqueTargets():68:71 -> c
-    1:5:boolean equals(java.lang.Object):124:128 -> equals
-    1:1:int hashCode():133:133 -> hashCode
+    1:5:boolean equals(java.lang.Object):131:135 -> equals
+    1:1:int hashCode():140:140 -> hashCode
     1:1:boolean isEmpty():51:51 -> isEmpty
-    1:1:java.util.Iterator iterator():100:100 -> iterator
+    1:1:java.util.Iterator iterator():107:107 -> iterator
     1:2:int size():55:56 -> size
 com.android.tools.r8.ir.code.CatchHandlers$1 -> com.android.tools.r8.D.b.B:
     com.android.tools.r8.ir.code.CatchHandlers this$0 -> b
     int nextIndex -> a
-    1:3:void <init>(com.android.tools.r8.ir.code.CatchHandlers):100:102 -> <init>
-    1:1:boolean hasNext():106:106 -> hasNext
-    1:4:com.android.tools.r8.ir.code.CatchHandlers$CatchHandler next():111:114 -> next
-    1:4:java.lang.Object next():100 -> next
+    1:3:void <init>(com.android.tools.r8.ir.code.CatchHandlers):107:109 -> <init>
+    1:1:boolean hasNext():113:113 -> hasNext
+    1:4:com.android.tools.r8.ir.code.CatchHandlers$CatchHandler next():118:121 -> next
+    1:4:java.lang.Object next():107 -> next
 com.android.tools.r8.ir.code.CatchHandlers$CatchHandler -> com.android.tools.r8.D.b.C:
     java.lang.Object target -> b
     com.android.tools.r8.graph.DexType guard -> a
@@ -23637,10 +23694,10 @@
     com.android.tools.r8.graph.DexType type -> h
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):30:31 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getType():45:45 -> 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
+    1:1:com.android.tools.r8.graph.DexType getType():45:45 -> C2
+    1:1:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> D2
+    1:1:com.android.tools.r8.ir.code.Value object():49 -> D2
+    2:2:com.android.tools.r8.ir.code.Value object():49:49 -> D2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41:41 -> a
@@ -23667,15 +23724,15 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> m
     1:1:java.lang.String toString():108:108 -> toString
-    int maxInValueRegister() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.D.b.G:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.Cmp$Bias bias -> i
     1:1:void <clinit>():26:26 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):35:36 -> <init>
-    boolean isCommutative() -> C2
+    boolean isCommutative() -> D2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:28:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:84 -> a
     29:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:86 -> a
@@ -23700,9 +23757,9 @@
     com.android.tools.r8.ir.code.Cmp asCmp() -> n
     1:17:java.lang.String toString():104:120 -> toString
     18:40:java.lang.String toString():109:131 -> toString
-    int maxInValueRegister() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.D.b.F:
     com.android.tools.r8.ir.code.Cmp$Bias LT -> c
     com.android.tools.r8.ir.code.Cmp$Bias NONE -> a
@@ -23716,7 +23773,7 @@
     com.android.tools.r8.graph.DexType clazz -> h
     1:1:void <clinit>():24:24 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):29:30 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getValue():61:61 -> B2
+    1:1:com.android.tools.r8.graph.DexType getValue():61:61 -> C2
     boolean instructionInstanceCanThrow() -> M0
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):40:40 -> a
@@ -23752,12 +23809,12 @@
     54:54:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):182:182 -> a
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):131:131 -> b
     boolean isConstClass() -> c1
-    boolean isOutConstant() -> e2
+    boolean isOutConstant() -> f2
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> o
     1:1:java.lang.String toString():83:83 -> toString
-    1:1:int maxInValueRegister():72:72 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():72:72 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.D.b.I:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):33:33 -> <init>
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> D0
@@ -23773,7 +23830,7 @@
     com.android.tools.r8.graph.DexMethodHandle methodHandle -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethodHandle):25:26 -> <init>
-    1:1:com.android.tools.r8.graph.DexMethodHandle getValue():57:57 -> B2
+    1:1:com.android.tools.r8.graph.DexMethodHandle getValue():57:57 -> C2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
     2:2:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):49:49 -> a
@@ -23790,21 +23847,21 @@
     11:11:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):120 -> a
     12:12:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):126:126 -> a
     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 com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodHandle():275:275 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):85 -> a
     boolean isConstMethodHandle() -> e1
-    boolean isOutConstant() -> e2
+    boolean isOutConstant() -> f2
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> q
     1:1:java.lang.String toString():95:95 -> toString
-    1:1:int maxInValueRegister():78:78 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():78:78 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.D.b.K:
     com.android.tools.r8.graph.DexProto methodType -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProto):25:26 -> <init>
-    1:1:com.android.tools.r8.graph.DexProto getValue():57:57 -> B2
+    1:1:com.android.tools.r8.graph.DexProto getValue():57:57 -> C2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
     2:2:com.android.tools.r8.ir.code.ConstMethodType copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodType):49:49 -> a
@@ -23821,53 +23878,53 @@
     11:11:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):114 -> a
     12:12:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):120:120 -> a
     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 com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodType():279:279 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):131 -> a
-    boolean isOutConstant() -> e2
     boolean isConstMethodType() -> f1
+    boolean isOutConstant() -> f2
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> r
     1:1:java.lang.String toString():89:89 -> toString
-    1:1:int maxInValueRegister():78:78 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():78:78 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.D.b.L:
     boolean $assertionsDisabled -> i
     long value -> h
     1:1:void <clinit>():32:32 -> <clinit>
     1:6:void <init>(com.android.tools.r8.ir.code.Value,long):37:42 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value dest():68:68 -> 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:double getDoubleValue():92 -> C2
-    3:4:double getDoubleValue():92:93 -> C2
-    1:1:float getFloatValue():87:87 -> D2
+    1:1:com.android.tools.r8.ir.code.Value dest():68:68 -> C2
+    1:1:double getDoubleValue():92:92 -> D2
     2:2:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> D2
-    2:2:float getFloatValue():87 -> D2
-    3:4:float getFloatValue():87:88 -> D2
-    1:1:int getIntValue():76:76 -> E2
+    2:2:double getDoubleValue():92 -> D2
+    3:4:double getDoubleValue():92:93 -> D2
+    1:1:float getFloatValue():87:87 -> E2
     2:2:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> E2
-    2:2: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:float getFloatValue():87 -> E2
+    3:4:float getFloatValue():87:88 -> E2
+    1:1:int getIntValue():76:76 -> F2
     2:2:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> F2
-    2:2: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 isIntegerOne():109 -> J2
-    2:2:boolean isIntegerOne():109:109 -> J2
+    2:2:int getIntValue():76 -> F2
+    3:3:int getIntValue():76:76 -> F2
+    4:4:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> F2
+    4:4:int getIntValue():77 -> F2
+    5:5:int getIntValue():77:77 -> F2
+    6:8:int getIntValue():76:78 -> F2
+    1:1:long getLongValue():82:82 -> G2
+    2:2:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> G2
+    2:2:long getLongValue():82 -> G2
+    3:4:long getLongValue():82:83 -> G2
+    1:1:long getRawValue():97:97 -> H2
+    1:1:boolean is16Bit():273:273 -> I2
+    1:1:boolean is8Bit():265:265 -> J2
     1:1:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> K2
-    1:1:boolean 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
+    1:1:boolean isIntegerOne():109 -> K2
+    2:2:boolean isIntegerOne():109:109 -> K2
+    1:1:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> L2
+    1:1:boolean isIntegerZero():105 -> L2
+    2:2:boolean isIntegerZero():105:105 -> L2
+    1:1:boolean isZero():101:101 -> M2
+    1:1:boolean negativeIs16Bit():277:277 -> N2
+    1:1:boolean negativeIs8Bit():269:269 -> O2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:2:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):56:57 -> a
     3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
@@ -23950,23 +24007,23 @@
     5:5:boolean verifyTypes(com.android.tools.r8.graph.AppView):319 -> b
     6:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):319:319 -> b
     7:7:boolean verifyTypes(com.android.tools.r8.graph.AppView):317:317 -> b
-    boolean isOutConstant() -> e2
+    boolean isOutConstant() -> f2
     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 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():234:234 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.D.b.M:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexString value -> h
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> i
     1:1:void <clinit>():20:20 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):26:28 -> <init>
-    1:1:com.android.tools.r8.graph.DexString getValue():58:58 -> B2
+    1:1:com.android.tools.r8.graph.DexString getValue():58:58 -> C2
     1:11:boolean instructionInstanceCanThrow():110:120 -> M0
     1:1:boolean instructionTypeCanThrow():90:90 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -23990,7 +24047,7 @@
     13:14:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:64 -> a
     15:15:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):69:69 -> a
     16:16:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129:129 -> a
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    17:17:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     17:17:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129 -> a
     18:18:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129:129 -> a
     19:19:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):134:134 -> a
@@ -23998,13 +24055,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() -> e2
+    boolean isOutConstant() -> f2
     boolean isConstString() -> h1
     com.android.tools.r8.ir.code.ConstString asConstString() -> t
     1:1:java.lang.String toString():85:85 -> toString
-    1:1:int maxInValueRegister():74:74 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():74:74 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.D.b.N:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -24016,10 +24073,10 @@
     4:4:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):43 -> a
     5:9:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):43:47 -> a
     10:18:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):46:54 -> a
-    19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     19:19:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):20 -> a
     20:31:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):21:32 -> a
-    32:32:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    32:32:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     32:32:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):20 -> a
 com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.D.b.O:
     1:1:void <init>():19:19 -> <init>
@@ -24035,9 +24092,9 @@
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):70 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     boolean isDebugLocalRead() -> l1
-    1:1:int maxInValueRegister():59:59 -> v2
-    1:1:int maxOutValueRegister():64:64 -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():59:59 -> w2
+    1:1:int maxOutValueRegister():64:64 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.D.b.P:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):21:21 -> <init>
     boolean isAllowedAfterThrowingInstruction() -> P0
@@ -24058,7 +24115,7 @@
     6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
     6:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):71 -> a
     7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):71:71 -> a
-    boolean isOutConstant() -> e2
+    boolean isOutConstant() -> f2
     boolean isDebugLocalWrite() -> n1
     com.android.tools.r8.ir.code.DebugLocalWrite asDebugLocalWrite() -> u
 com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.D.b.S:
@@ -24067,8 +24124,8 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap ending -> h
     1:1:void <clinit>():19:19 -> <clinit>
     1:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):26:29 -> <init>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():43:43 -> B2
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():47:47 -> C2
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():43:43 -> C2
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():47:47 -> D2
     boolean hasInvariantOutType() -> I0
     boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -24089,9 +24146,9 @@
     boolean isDebugLocalsChange() -> o1
     1:6:java.lang.String toString():92:97 -> toString
     com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> v
-    1:1:int maxInValueRegister():77:77 -> v2
-    1:1:int maxOutValueRegister():82:82 -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():77:77 -> w2
+    1:1:int maxOutValueRegister():82:82 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.D.b.T:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():16:16 -> <clinit>
@@ -24108,10 +24165,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):66 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     boolean isDebugPosition() -> p1
-    1:1:int maxInValueRegister():55:55 -> v2
     com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> w
-    1:1:int maxOutValueRegister():60:60 -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():55:55 -> w2
+    1:1:int maxOutValueRegister():60:60 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.D.b.U:
     1:1:void <init>():7:7 -> <init>
     java.lang.Object handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction) -> a
@@ -24133,8 +24190,8 @@
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> i
     1:1:void <clinit>():22:22 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):33:36 -> <init>
-    1:1:com.android.tools.r8.graph.DexReference getItem():63:63 -> B2
-    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():67:67 -> C2
+    1:1:com.android.tools.r8.graph.DexReference getItem():63:63 -> C2
+    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():67:67 -> D2
     boolean instructionInstanceCanThrow() -> M0
     1:1:boolean instructionTypeCanThrow():113:113 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -24165,17 +24222,17 @@
     21:21:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):146:146 -> a
     22:22:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):151:151 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isOutConstant() -> e2
+    boolean isOutConstant() -> f2
     boolean isDexItemBasedConstString() -> q1
     1:1:java.lang.String toString():108:108 -> toString
-    1:1:int maxInValueRegister():97:97 -> v2
-    int maxOutValueRegister() -> w2
+    1:1:int maxInValueRegister():97:97 -> w2
     com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> x
-    int opcode() -> x2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Div -> com.android.tools.r8.D.b.W:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> G2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> H2
     1:1:boolean instructionTypeCanThrow():134:134 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -24195,8 +24252,8 @@
     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() -> r1
-    int opcode() -> x2
     com.android.tools.r8.ir.code.Div asDiv() -> y
+    int opcode() -> y2
 com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.D.b.a0:
     com.android.tools.r8.ir.code.BasicBlock[] sorted -> a
     com.android.tools.r8.ir.code.BasicBlock[] doms -> b
@@ -24255,19 +24312,19 @@
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):21:21 -> <init>
     2:3:void <init>(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.Value):25:26 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> B2
-    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():51 -> 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 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
+    1:1:com.android.tools.r8.ir.code.StackValue outBottom():55 -> C2
     2:2:com.android.tools.r8.ir.code.StackValue[] getStackValues():51:51 -> C2
-    2:2:com.android.tools.r8.ir.code.StackValue 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
+    2:2:com.android.tools.r8.ir.code.StackValue outBottom():55 -> C2
+    3:3:com.android.tools.r8.ir.code.StackValue outBottom():55:55 -> C2
+    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> D2
+    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():51 -> D2
+    1:1:com.android.tools.r8.ir.code.StackValue outTop():59 -> D2
+    2:2:com.android.tools.r8.ir.code.StackValue[] getStackValues():51:51 -> D2
+    2:2:com.android.tools.r8.ir.code.StackValue outTop():59 -> D2
+    3:3:com.android.tools.r8.ir.code.StackValue outTop():59:59 -> D2
+    1:1:com.android.tools.r8.ir.code.StackValue src():63:63 -> E2
     boolean hasInvariantOutType() -> I0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -24279,9 +24336,9 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):41:46 -> e
     boolean isDup() -> s1
-    int maxInValueRegister() -> v2
-    1:1:int maxOutValueRegister():92:92 -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():92:92 -> x2
+    int opcode() -> y2
     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
@@ -24299,9 +24356,9 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):55:60 -> e
     boolean isDup2() -> t1
-    int maxInValueRegister() -> v2
-    1:1:int maxOutValueRegister():106:106 -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():106:106 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.D.b.d0:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexField field -> h
@@ -24309,12 +24366,12 @@
     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 -> B2
-    1:1:com.android.tools.r8.ir.code.FieldMemberType getType():39:39 -> C2
-    com.android.tools.r8.ir.code.Value value() -> D2
+    1:1:com.android.tools.r8.graph.DexField getField():43:43 -> C2
+    1:1:com.android.tools.r8.ir.code.FieldMemberType getType():39:39 -> D2
+    com.android.tools.r8.ir.code.Value value() -> E2
     boolean hasInvariantOutType() -> I0
     1:24:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):59:82 -> a
-    25:25:boolean com.android.tools.r8.graph.DexEncodedField.isStaticMember():124:124 -> a
+    25:25:boolean com.android.tools.r8.graph.DexEncodedField.isStaticMember():123:123 -> a
     25:25:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):86 -> a
     26:43:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):87:104 -> a
     44:44:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
@@ -24364,7 +24421,7 @@
     1:3:void <init>(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,int):16:18 -> <init>
     boolean isConstant() -> D
     boolean isFixedRegisterValue() -> F
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():1186:1186 -> V
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():1199:1199 -> V
     1:1:com.android.tools.r8.ir.code.ValueType outType():23 -> V
     2:23:com.android.tools.r8.ir.code.ValueType outType():24:45 -> V
     24:25:com.android.tools.r8.ir.code.ValueType outType():42:43 -> V
@@ -24376,7 +24433,7 @@
     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 -> C2
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():36:39 -> D2
     boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -24385,7 +24442,7 @@
     4:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):85:85 -> a
     5:5:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):104:104 -> a
     6:6:void com.android.tools.r8.ir.code.BasicBlockIterator.<init>(com.android.tools.r8.ir.code.IRCode):17:17 -> a
-    6:6:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator():893 -> a
+    6:6:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator():942 -> a
     6:6:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):105 -> a
     7:7:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():27:27 -> a
     7:7:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):106 -> a
@@ -24398,14 +24455,14 @@
     10:10:java.lang.Object com.android.tools.r8.ir.code.BasicBlockIterator.next():9 -> a
     10:10:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):109 -> a
     11:11:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):109:109 -> a
-    12:12:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator():893:893 -> a
+    12:12:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator():942:942 -> a
     12:12:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):105 -> a
     13:13:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):117:117 -> a
     1:4:java.lang.String toString():71:74 -> toString
-    1:1:int maxInValueRegister():59:59 -> v2
-    1:1:int maxOutValueRegister():65:65 -> w2
+    1:1:int maxInValueRegister():59:59 -> w2
     boolean isGoto() -> x1
-    int opcode() -> x2
+    1:1:int maxOutValueRegister():65:65 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.D.b.j0:
     com.android.tools.r8.ir.code.ValueNumberGenerator valueNumberGenerator -> c
     com.android.tools.r8.graph.DexEncodedMethod method -> a
@@ -24418,272 +24475,294 @@
     com.android.tools.r8.utils.InternalOptions options -> i
     com.android.tools.r8.origin.Origin origin -> j
     java.util.LinkedList blocks -> b
-    1:1:void <clinit>():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():804:815 -> A
-    1:8:boolean verifyNoNullabilityBottomTypes():819:826 -> B
-    1:14:boolean verifySplitCriticalEdges():325:338 -> C
-    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):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):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):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
+    1:1:void <clinit>():48:48 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod,java.util.LinkedList,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):122:122 -> <init>
+    2:32:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod,java.util.LinkedList,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):102:132 -> <init>
+    1:20:void traceBlocks():397:416 -> A
+    21:33:void traceBlocks():415:427 -> A
+    34:34:boolean noColorsInUse():1145:1145 -> A
+    34:34:void traceBlocks():427 -> A
+    35:35:void traceBlocks():427:427 -> A
+    1:12:boolean verifyNoImpreciseOrBottomTypes():849:860 -> B
+    1:8:boolean verifyNoNullabilityBottomTypes():864:871 -> C
+    1:14:boolean verifySplitCriticalEdges():370:383 -> D
+    1:6:boolean computeAllThrowingInstructionsHavePositions():1068:1073 -> E
+    1:12:boolean verifyNoValueWithOnlyAssumeInstructionAsUsers():875:886 -> F
+    1:17:boolean controlFlowMayDependOnEnvironment(com.android.tools.r8.graph.AppView):263:279 -> a
+    18:18:boolean lambda$prepareBlocksForCatchHandlers$0(com.android.tools.r8.ir.code.BasicBlock):331:331 -> a
+    19:23:void ensureBlockNumbering():431:435 -> a
+    19:23:void print(com.android.tools.r8.utils.CfgPrinter):537 -> a
+    24:25:void print(com.android.tools.r8.utils.CfgPrinter):538:539 -> a
+    26:26:boolean lambda$verifyTypes$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.BasicBlock):589:589 -> a
+    27:27:void lambda$consistentBlockNumbering$2(java.lang.Integer,java.lang.Long):744:744 -> a
+    28:34:boolean lambda$verifyNoImpreciseOrBottomTypes$3(com.android.tools.r8.ir.code.Value):851:857 -> a
+    35:35:boolean lambda$verifyNoImpreciseOrBottomTypes$3(com.android.tools.r8.ir.code.Value):856:856 -> a
+    36:39:boolean lambda$wrapSSAVerifierWithStackValueHandling$8(java.util.function.Predicate,com.android.tools.r8.ir.code.Value):893:896 -> a
+    40:40:java.lang.Iterable instructions(java.util.function.Predicate):920:920 -> a
+    41:42:java.util.List collectArguments(boolean):976:977 -> a
+    41:42:java.util.List collectArguments():972 -> a
+    43:43:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> a
+    43:43:java.util.List collectArguments(boolean):977 -> a
+    43:43:java.util.List collectArguments():972 -> a
+    44:47:java.util.List collectArguments(boolean):978:981 -> a
+    44:47:java.util.List collectArguments():972 -> a
+    48:48:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    48:48:java.util.List collectArguments(boolean):981 -> a
+    48:48:java.util.List collectArguments():972 -> a
+    49:54:java.util.List collectArguments(boolean):983:988 -> a
+    49:54:java.util.List collectArguments():972 -> a
+    55:55:java.util.List collectArguments(boolean):987:987 -> a
+    55:55:java.util.List collectArguments():972 -> a
+    56:56:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> a
+    56:56:java.util.List collectArguments(boolean):977 -> a
+    56:56:java.util.List collectArguments():972 -> a
+    57:57:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):1004:1004 -> a
+    58:59:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int,com.android.tools.r8.graph.DebugLocalInfo):1026:1027 -> a
+    60:60:void setAllThrowingInstructionsHavePositions(boolean):1064:1064 -> a
+    61:64:void removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):1093:1096 -> a
+    65:65:boolean isMarkingColorInUse(int):1132:1132 -> a
+    66:66:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1149:1149 -> a
+    67:75:java.util.Set getBlocksReachableFromExclusive(com.android.tools.r8.ir.code.BasicBlock):1174:1182 -> a
+    67:75:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1150 -> a
+    76:81:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1151:1156 -> a
+    82:82:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    82:82:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1156 -> a
+    83:89:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1157:1163 -> a
     90:90:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    90:90:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):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
+    90:90:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1163 -> a
+    91:91:void markTransitiveSuccessors(java.util.Deque,int):1221:1221 -> a
+    92:92:boolean isMarkingColorInUse(int):1132:1132 -> a
+    92:92:void markTransitiveSuccessors(java.util.Deque,int):1221 -> a
+    93:94:boolean anyBlocksMarkedWithColor(int):1136:1137 -> a
+    93:94:void markTransitiveSuccessors(java.util.Deque,int):1221 -> a
+    95:104:void markTransitiveSuccessors(java.util.Deque,int):1221:1230 -> a
+    105:105:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1242:1242 -> a
+    106:106:boolean isMarkingColorInUse(int):1132:1132 -> a
+    106:106:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1242 -> a
+    107:118:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1242:1253 -> a
+    119:119:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(com.android.tools.r8.ir.code.Instruction):1602:1602 -> a
+    119:119:java.util.Iterator lambda$getInstructionsReachableFrom$10(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):1161 -> a
+    1:52:java.util.Map computeLiveAtEntrySets():147:198 -> b
+    53:56:java.util.Map computeLiveAtEntrySets():197:200 -> b
     57:57:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasPrevious():73:73 -> b
-    57:57:java.util.Map computeLiveAtEntrySets():202 -> b
-    58:58:java.util.Map computeLiveAtEntrySets():203:203 -> b
+    57:57:java.util.Map computeLiveAtEntrySets():200 -> b
+    58:58:java.util.Map computeLiveAtEntrySets():201:201 -> b
     59:59:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> b
-    59:59:java.util.Map computeLiveAtEntrySets():204 -> b
-    60:73:java.util.Map computeLiveAtEntrySets():206:219 -> b
+    59:59:java.util.Map computeLiveAtEntrySets():202 -> b
+    60:73:java.util.Map computeLiveAtEntrySets():204:217 -> b
     74:74:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> b
-    74:74:java.util.Map computeLiveAtEntrySets():223 -> b
-    75:110:java.util.Map computeLiveAtEntrySets():223:258 -> b
-    111:111:boolean com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets.isEmpty():78:78 -> b
-    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):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):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):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():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
+    74:74:java.util.Map computeLiveAtEntrySets():221 -> b
+    75:110:java.util.Map computeLiveAtEntrySets():221:256 -> b
+    111:111:boolean com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets.isEmpty():81:81 -> b
+    111:111:java.util.Map computeLiveAtEntrySets():256 -> b
+    112:114:java.util.Map computeLiveAtEntrySets():256:258 -> b
+    115:125:boolean hasNoVerticallyMergedClasses(com.android.tools.r8.graph.AppView):554:564 -> b
+    126:128:boolean lambda$verifyNoNullabilityBottomTypes$4(com.android.tools.r8.ir.code.Value):866:868 -> b
+    129:129:boolean lambda$verifyNoNullabilityBottomTypes$4(com.android.tools.r8.ir.code.Value):866:866 -> b
+    130:130:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():924:924 -> b
+    130:130:java.util.Iterator lambda$instructions$9(java.util.function.Predicate):920 -> b
+    131:131:java.util.Iterator lambda$instructions$9(java.util.function.Predicate):920:920 -> b
+    132:132:java.util.ListIterator listIterator(int):946:946 -> b
+    133:133:boolean lambda$findFirstNonNonePosition$11(com.android.tools.r8.ir.code.Instruction):1261:1261 -> b
+    1:2:boolean verifyTypes(com.android.tools.r8.graph.AppView):585:586 -> c
+    3:6:boolean validAssumeDynamicTypeInstructions(com.android.tools.r8.graph.AppView):594:597 -> c
+    3:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):586 -> c
+    7:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):587:589 -> c
+    10:15:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$7(com.android.tools.r8.ir.code.Value):877:882 -> c
+    16:22:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$7(com.android.tools.r8.ir.code.Value):877:883 -> c
+    23:23:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$5(com.android.tools.r8.ir.code.Instruction):878:878 -> c
+    24:27:boolean verifySSATypeLattice(java.util.function.Predicate):902:905 -> c
+    28:28:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> c
+    28:28:boolean verifySSATypeLattice(java.util.function.Predicate):905 -> c
+    29:33:boolean verifySSATypeLattice(java.util.function.Predicate):905:909 -> c
+    34:40:java.util.List computeNormalExitBlocks():932:938 -> c
+    41:41:void returnMarkingColor(int):1126:1126 -> c
+    42:42:boolean isMarkingColorInUse(int):1132:1132 -> c
+    42:42:void returnMarkingColor(int):1126 -> c
+    43:43:void returnMarkingColor(int):1126:1126 -> c
+    44:45:void clearMarks(int):452:453 -> c
+    44:45:void returnMarkingColor(int):1127 -> c
+    46:46:void returnMarkingColor(int):1128:1128 -> c
+    1:4:boolean consistentBlockNumbering():739:742 -> d
+    5:5:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$6(com.android.tools.r8.ir.code.Instruction):881:881 -> d
+    6:6:java.util.function.Predicate wrapSSAVerifierWithStackValueHandling(java.util.function.Predicate):890:890 -> d
+    1:1:com.android.tools.r8.ir.code.ConstNumber createConstNull():1050:1050 -> e
+    2:2:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> e
+    2:2:com.android.tools.r8.ir.code.ConstNumber createConstNull():1050 -> e
+    3:3:com.android.tools.r8.ir.code.ConstNumber createConstNull():1051:1051 -> e
+    1:1:boolean doAllThrowingInstructionsHavePositions():1060:1060 -> f
+    1:1:com.android.tools.r8.ir.code.BasicBlock entryBlock():140:140 -> g
+    1:1:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1261:1261 -> h
+    2:2:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> h
+    2:2:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1261 -> h
+    3:16:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1261:1274 -> h
+    17:17:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> h
+    17:17:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1261 -> h
+    1:1:int getHighestBlockNumber():1040:1040 -> i
+    1:1:int getNextInstructionNumber():968:968 -> j
+    1:4:com.android.tools.r8.ir.code.Value getThis():993:996 -> k
+    5:5:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> k
+    5:5:com.android.tools.r8.ir.code.Value getThis():996 -> k
+    6:8:com.android.tools.r8.ir.code.Value getThis():996:998 -> k
     9:9:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> k
-    9:9:com.android.tools.r8.ir.code.Value getThis():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():1073:1073 -> o
-    2:2:boolean isConsistentGraph():527 -> o
-    3:5:boolean isConsistentGraph():527:529 -> o
-    6:21:boolean consistentPredecessorSuccessors():665:680 -> o
-    6:21:boolean isConsistentGraph():529 -> o
-    22:22:boolean isConsistentGraph():530:530 -> o
-    23:24:boolean consistentCatchHandlers():687:688 -> o
-    23:24:boolean isConsistentGraph():530 -> o
-    25:25:boolean isConsistentGraph():531:531 -> o
-    26:29:boolean consistentBlockInstructions():706:709 -> o
-    26:29:boolean isConsistentGraph():531 -> o
-    30:30:boolean consistentBlockInstructions():707:707 -> o
-    30:30:boolean isConsistentGraph():531 -> o
-    31:31:boolean isConsistentGraph():532:532 -> o
-    32:88:boolean consistentMetadata():716:772 -> o
-    32:88:boolean isConsistentGraph():532 -> o
-    89:89:boolean isConsistentGraph():533:533 -> o
-    1:2:boolean isConsistentSSA():499:500 -> p
-    3:19:boolean consistentDefUseChains():589:605 -> p
-    3:19:boolean isConsistentSSA():500 -> p
+    9:9:com.android.tools.r8.ir.code.Value getThis():998 -> k
+    10:10:com.android.tools.r8.ir.code.Value getThis():999:999 -> k
+    11:11:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> k
+    11:11:com.android.tools.r8.ir.code.Value getThis():996 -> k
+    1:3:java.util.Set getUnreachableBlocks():1187:1189 -> l
+    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1217:1217 -> l
+    4:4:java.util.Set getUnreachableBlocks():1189 -> l
+    5:10:java.util.Set getUnreachableBlocks():1190:1195 -> l
+    1:1:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():924:924 -> m
+    1:1:java.lang.Iterable instructions():916:916 -> n
+    1:1:boolean isConsistentGraph():572:572 -> o
+    2:2:boolean noColorsInUse():1145:1145 -> o
+    2:2:boolean isConsistentGraph():572 -> o
+    3:5:boolean isConsistentGraph():572:574 -> o
+    6:21:boolean consistentPredecessorSuccessors():710:725 -> o
+    6:21:boolean isConsistentGraph():574 -> o
+    22:22:boolean isConsistentGraph():575:575 -> o
+    23:24:boolean consistentCatchHandlers():732:733 -> o
+    23:24:boolean isConsistentGraph():575 -> o
+    25:25:boolean isConsistentGraph():576:576 -> o
+    26:29:boolean consistentBlockInstructions():751:754 -> o
+    26:29:boolean isConsistentGraph():576 -> o
+    30:30:boolean consistentBlockInstructions():752:752 -> o
+    30:30:boolean isConsistentGraph():576 -> o
+    31:31:boolean isConsistentGraph():577:577 -> o
+    32:88:boolean consistentMetadata():761:817 -> o
+    32:88:boolean isConsistentGraph():577 -> o
+    89:89:boolean isConsistentGraph():578:578 -> o
+    1:2:boolean isConsistentSSA():544:545 -> p
+    3:19:boolean consistentDefUseChains():634:650 -> p
+    3:19:boolean isConsistentSSA():545 -> p
     20:20:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> p
-    20:20:boolean consistentDefUseChains():606 -> p
-    20:20:boolean isConsistentSSA():500 -> p
-    21:22:boolean consistentDefUseChains():608:609 -> p
-    21:22:boolean isConsistentSSA():500 -> p
+    20:20:boolean consistentDefUseChains():651 -> p
+    20:20:boolean isConsistentSSA():545 -> p
+    21:22:boolean consistentDefUseChains():653:654 -> p
+    21:22:boolean isConsistentSSA():545 -> p
     23:23:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> p
-    23:23:boolean consistentDefUseChains():611 -> p
-    23:23:boolean isConsistentSSA():500 -> p
-    24:36:boolean consistentDefUseChains():611:623 -> p
-    24:36:boolean isConsistentSSA():500 -> p
-    37:37:boolean verifyValue(com.android.tools.r8.ir.code.Value):631:631 -> p
-    37:37:boolean consistentDefUseChains():623 -> p
-    37:37:boolean isConsistentSSA():500 -> p
-    38:38:boolean verifyPhi(com.android.tools.r8.ir.code.Phi):636:636 -> p
-    38:38:boolean verifyValue(com.android.tools.r8.ir.code.Value):631 -> p
-    38:38:boolean consistentDefUseChains():623 -> p
-    38:38:boolean isConsistentSSA():500 -> p
-    39:39:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):641:641 -> p
-    39:39:boolean verifyValue(com.android.tools.r8.ir.code.Value):631 -> p
-    39:39:boolean consistentDefUseChains():623 -> p
-    39:39:boolean isConsistentSSA():500 -> p
+    23:23:boolean consistentDefUseChains():656 -> p
+    23:23:boolean isConsistentSSA():545 -> p
+    24:36:boolean consistentDefUseChains():656:668 -> p
+    24:36:boolean isConsistentSSA():545 -> p
+    37:37:boolean verifyValue(com.android.tools.r8.ir.code.Value):676:676 -> p
+    37:37:boolean consistentDefUseChains():668 -> p
+    37:37:boolean isConsistentSSA():545 -> p
+    38:38:boolean verifyPhi(com.android.tools.r8.ir.code.Phi):681:681 -> p
+    38:38:boolean verifyValue(com.android.tools.r8.ir.code.Value):676 -> p
+    38:38:boolean consistentDefUseChains():668 -> p
+    38:38:boolean isConsistentSSA():545 -> p
+    39:39:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):686:686 -> p
+    39:39:boolean verifyValue(com.android.tools.r8.ir.code.Value):676 -> p
+    39:39:boolean consistentDefUseChains():668 -> p
+    39:39:boolean isConsistentSSA():545 -> p
     40:40:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> p
-    40:40:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):641 -> p
-    40:40:boolean verifyValue(com.android.tools.r8.ir.code.Value):631 -> p
-    40:40:boolean consistentDefUseChains():623 -> p
-    40:40:boolean isConsistentSSA():500 -> p
-    41:43:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):642:644 -> p
-    41:43:boolean verifyValue(com.android.tools.r8.ir.code.Value):631 -> p
-    41:43:boolean consistentDefUseChains():623 -> p
-    41:43:boolean isConsistentSSA():500 -> p
-    44:44:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):642:642 -> p
-    44:44:boolean verifyValue(com.android.tools.r8.ir.code.Value):631 -> p
-    44:44:boolean consistentDefUseChains():623 -> p
-    44:44:boolean isConsistentSSA():500 -> p
-    45:45:boolean consistentDefUseChains():624:624 -> p
-    45:45:boolean isConsistentSSA():500 -> p
-    46:47:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):649:650 -> p
-    46:47:boolean consistentDefUseChains():624 -> p
-    46:47:boolean isConsistentSSA():500 -> p
+    40:40:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):686 -> p
+    40:40:boolean verifyValue(com.android.tools.r8.ir.code.Value):676 -> p
+    40:40:boolean consistentDefUseChains():668 -> p
+    40:40:boolean isConsistentSSA():545 -> p
+    41:43:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):687:689 -> p
+    41:43:boolean verifyValue(com.android.tools.r8.ir.code.Value):676 -> p
+    41:43:boolean consistentDefUseChains():668 -> p
+    41:43:boolean isConsistentSSA():545 -> p
+    44:44:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):687:687 -> p
+    44:44:boolean verifyValue(com.android.tools.r8.ir.code.Value):676 -> p
+    44:44:boolean consistentDefUseChains():668 -> p
+    44:44:boolean isConsistentSSA():545 -> p
+    45:45:boolean consistentDefUseChains():669:669 -> p
+    45:45:boolean isConsistentSSA():545 -> p
+    46:47:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):694:695 -> p
+    46:47:boolean consistentDefUseChains():669 -> p
+    46:47:boolean isConsistentSSA():545 -> p
     48:48:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> p
-    48:48:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):650 -> p
-    48:48:boolean consistentDefUseChains():624 -> p
-    48:48:boolean isConsistentSSA():500 -> p
-    49:57:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):650:658 -> p
-    49:57:boolean consistentDefUseChains():624 -> p
-    49:57:boolean isConsistentSSA():500 -> p
-    58:58:boolean isConsistentSSA():501:501 -> p
-    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():901:903 -> s
-    1:7:int numberRemainingInstructions():909:915 -> t
-    1:7:java.lang.String toString():397:403 -> toString
-    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():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():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():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():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():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():1136 -> v
-    14:17:void com.android.tools.r8.ir.code.BasicBlockIterator.remove():84:87 -> v
-    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():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
-    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():441 -> y
-    25:25:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():442:442 -> y
-    26:37:com.android.tools.r8.com.google.common.collect.ImmutableList reorderExceptionalBlocksLastForTesting(com.android.tools.r8.com.google.common.collect.ImmutableList):477:488 -> y
-    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():1073:1073 -> z
-    34:34:void traceBlocks():382 -> z
-    35:35:void traceBlocks():382:382 -> z
+    48:48:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):695 -> p
+    48:48:boolean consistentDefUseChains():669 -> p
+    48:48:boolean isConsistentSSA():545 -> p
+    49:57:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):695:703 -> p
+    49:57:boolean consistentDefUseChains():669 -> p
+    49:57:boolean isConsistentSSA():545 -> p
+    58:58:boolean isConsistentSSA():546:546 -> p
+    59:75:boolean validThrowingInstructions():825:841 -> p
+    59:75:boolean isConsistentSSA():546 -> p
+    76:76:boolean isConsistentSSA():547:547 -> p
+    77:88:boolean noCriticalEdges():605:616 -> p
+    77:88:boolean isConsistentSSA():547 -> p
+    89:91:boolean isConsistentSSA():547:549 -> p
+    1:1:java.util.ListIterator listIterator():942:942 -> q
+    1:1:com.android.tools.r8.ir.code.IRMetadata metadata():136:136 -> r
+    1:3:com.android.tools.r8.com.google.common.collect.ImmutableList numberInstructions():950:952 -> s
+    1:7:int numberRemainingInstructions():958:964 -> t
+    1:7:java.lang.String toString():442:448 -> toString
+    1:1:void prepareBlocksForCatchHandlers():300:300 -> u
+    2:2:java.util.ListIterator listIterator():942:942 -> u
+    2:2:void prepareBlocksForCatchHandlers():301 -> u
+    3:3:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():27:27 -> u
+    3:3:void prepareBlocksForCatchHandlers():302 -> u
+    4:7:void prepareBlocksForCatchHandlers():303:306 -> u
+    8:8:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():57:57 -> u
+    8:8:void prepareBlocksForCatchHandlers():306 -> u
+    9:9:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> u
+    9:9:void prepareBlocksForCatchHandlers():307 -> u
+    10:11:void prepareBlocksForCatchHandlers():308:309 -> u
+    12:12:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> u
+    12:12:void prepareBlocksForCatchHandlers():311 -> u
+    13:25:void prepareBlocksForCatchHandlers():312:324 -> u
+    26:27:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> u
+    26:27:void prepareBlocksForCatchHandlers():324 -> u
+    28:29:void prepareBlocksForCatchHandlers():325:326 -> u
+    30:30:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> u
+    30:30:void prepareBlocksForCatchHandlers():326 -> u
+    31:35:void prepareBlocksForCatchHandlers():327:331 -> u
+    1:1:void removeAllTrivialPhis():1081:1081 -> v
+    1:3:java.util.Set removeUnreachableBlocks():1200:1202 -> w
+    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1217:1217 -> w
+    4:4:java.util.Set removeUnreachableBlocks():1202 -> w
+    5:5:void com.android.tools.r8.ir.code.BasicBlockIterator.<init>(com.android.tools.r8.ir.code.IRCode):17:17 -> w
+    5:5:java.util.ListIterator listIterator():942 -> w
+    5:5:java.util.Set removeUnreachableBlocks():1203 -> w
+    6:6:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():27:27 -> w
+    6:6:java.util.Set removeUnreachableBlocks():1204 -> w
+    7:7:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.next():32:32 -> w
+    7:7:java.lang.Object com.android.tools.r8.ir.code.BasicBlockIterator.next():9 -> w
+    7:7:java.util.Set removeUnreachableBlocks():1205 -> w
+    8:9:java.util.Set removeUnreachableBlocks():1206:1207 -> w
+    10:11:void com.android.tools.r8.ir.code.BasicBlockIterator.remove():81:82 -> w
+    10:11:java.util.Set removeUnreachableBlocks():1208 -> w
+    12:12:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():57:57 -> w
+    12:12:void com.android.tools.r8.ir.code.BasicBlockIterator.remove():82 -> w
+    12:12:java.util.Set removeUnreachableBlocks():1208 -> w
+    13:13:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> w
+    13:13:void com.android.tools.r8.ir.code.BasicBlockIterator.remove():83 -> w
+    13:13:java.util.Set removeUnreachableBlocks():1208 -> w
+    14:17:void com.android.tools.r8.ir.code.BasicBlockIterator.remove():84:87 -> w
+    14:17:java.util.Set removeUnreachableBlocks():1208 -> w
+    18:19:java.util.Set removeUnreachableBlocks():1211:1212 -> w
+    1:1:int reserveMarkingColor():1102:1102 -> x
+    2:2:boolean anyMarkingColorAvailable():1116:1116 -> x
+    2:2:int reserveMarkingColor():1102 -> x
+    3:11:int reserveMarkingColor():1102:1110 -> x
+    12:13:boolean verifyNoBlocksMarked(int):468:469 -> x
+    12:13:int reserveMarkingColor():1110 -> x
+    1:24:void splitCriticalEdges():335:358 -> y
+    25:34:void splitCriticalEdges():357:366 -> y
+    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList depthFirstSorting():493:516 -> z
+    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():486 -> z
+    25:25:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():487:487 -> z
+    26:37:com.android.tools.r8.com.google.common.collect.ImmutableList reorderExceptionalBlocksLastForTesting(com.android.tools.r8.com.google.common.collect.ImmutableList):522:533 -> z
+    26:37:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():488 -> z
 com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.D.b.h0:
     com.android.tools.r8.ir.code.BasicBlock block -> a
-    1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):86:87 -> <init>
+    1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):89:90 -> <init>
 com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.D.b.i0:
     java.util.Deque liveStackValues -> c
     java.util.Set liveValues -> a
     java.util.Set liveLocalValues -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():49:49 -> <clinit>
-    1:5:void <init>(java.util.Set,java.util.Set,java.util.Deque):59:63 -> <init>
-    1:2:boolean equals(java.lang.Object):73:74 -> equals
-    1:1:int hashCode():68:68 -> hashCode
+    1:1:void <clinit>():52:52 -> <clinit>
+    1:5:void <init>(java.util.Set,java.util.Set,java.util.Deque):62:66 -> <init>
+    1:2:boolean equals(java.lang.Object):76:77 -> equals
+    1:1:int hashCode():71:71 -> hashCode
 com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.D.b.k0:
     java.util.ListIterator blockIterator -> a
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> b
@@ -24806,18 +24885,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 -> B2
     com.android.tools.r8.ir.code.If asIf() -> C
-    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
+    1:4:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():132:135 -> C2
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTrueTarget():117:120 -> D2
+    1:1:com.android.tools.r8.ir.code.If$Type getType():106:106 -> E2
+    1:2:void invert():110:111 -> F2
+    3:4:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):140:141 -> F2
+    3:4:void invert():112 -> F2
+    5:5:void invert():113:113 -> F2
+    1:1:boolean isZeroTest():93:93 -> G2
+    1:1:com.android.tools.r8.ir.code.Value lhs():97:97 -> H2
+    1:2:com.android.tools.r8.ir.code.Value rhs():101:102 -> I2
+    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():214:216 -> J2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:3:boolean verifyTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.If$Type):65:67 -> a
     4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):146:146 -> a
@@ -24848,10 +24927,10 @@
     31:31:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):223:223 -> b
     1:4:void setTrueTarget(com.android.tools.r8.ir.code.BasicBlock):124:127 -> c
     1:8:java.lang.String toString():161:168 -> toString
-    1:1:int maxInValueRegister():174:174 -> v2
-    1:1:int maxOutValueRegister():179:179 -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():174:174 -> w2
+    1:1:int maxOutValueRegister():179:179 -> x2
     boolean isIf() -> y1
+    int opcode() -> y2
 com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.D.b.n0:
     com.android.tools.r8.ir.code.If$Type GT -> c
     com.android.tools.r8.ir.code.If$Type LE -> d
@@ -24886,18 +24965,17 @@
     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() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.D.b.r0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():34:34 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):37:37 -> <init>
-    boolean throwsOnNullInput() -> A2
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():207:207 -> B0
+    boolean throwsOnNullInput() -> B2
     com.android.tools.r8.ir.code.InstanceGet asInstanceGet() -> D
-    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:1:com.android.tools.r8.ir.code.Value value():66:66 -> E2
     1:2:com.android.tools.r8.ir.code.Value object():60:61 -> F2
     boolean instructionTypeCanThrow() -> N0
     1:1:boolean outTypeKnownToBeBoolean(java.util.Set):47:47 -> a
@@ -24929,16 +25007,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() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
     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>
     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
+    1:1:com.android.tools.r8.graph.DexType type():39:39 -> C2
+    1:1:com.android.tools.r8.ir.code.Value value():47:47 -> D2
     com.android.tools.r8.ir.code.InstanceOf asInstanceOf() -> E
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
@@ -24953,19 +25031,19 @@
     8:9:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):105:106 -> a
     10:10:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int maxInValueRegister() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.D.b.t0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():34:34 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):37:39 -> <init>
-    boolean throwsOnNullInput() -> A2
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():219:219 -> B0
     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
+    boolean throwsOnNullInput() -> B2
+    1:1:com.android.tools.r8.ir.code.Value value():58:58 -> E2
     com.android.tools.r8.ir.code.InstancePut asInstancePut() -> F
+    1:1:com.android.tools.r8.ir.code.Value object():53:53 -> F2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):49:49 -> a
     2:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:92 -> a
@@ -24989,9 +25067,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() -> v2
-    1:1:int maxOutValueRegister():170:170 -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():170:170 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.D.b.u0:
     java.util.List inValues -> b
     java.util.Set debugValues -> e
@@ -25010,10 +25088,11 @@
     com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction() -> A
     1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():595:595 -> A0
     boolean isInstanceOf() -> A1
-    boolean throwsOnNullInput() -> A2
+    1:1:com.android.tools.r8.ir.code.Value outValue():120:120 -> A2
     com.android.tools.r8.ir.code.Goto asGoto() -> B
-    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():1361:1361 -> B0
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():1365:1365 -> B0
     boolean isInstancePut() -> B1
+    boolean throwsOnNullInput() -> B2
     com.android.tools.r8.ir.code.If asIf() -> C
     1:1:int getNumber():342:342 -> C0
     boolean isIntSwitch() -> C1
@@ -25072,22 +25151,22 @@
     boolean isMonitor() -> T1
     com.android.tools.r8.ir.code.Load asLoad() -> U
     boolean isArrayLength() -> U0
-    boolean isMove() -> U1
+    boolean isMonitorEnter() -> U1
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> V
     boolean isArrayPut() -> V0
-    boolean isMoveException() -> V1
+    boolean isMove() -> V1
     com.android.tools.r8.ir.code.Monitor asMonitor() -> W
     boolean isAssume() -> W0
-    boolean isMul() -> W1
+    boolean isMoveException() -> W1
     com.android.tools.r8.ir.code.Move asMove() -> X
     boolean isAssumeDynamicType() -> X0
-    boolean isNeg() -> X1
+    boolean isMul() -> X1
     com.android.tools.r8.ir.code.MoveException asMoveException() -> Y
     boolean isAssumeNonNull() -> Y0
-    boolean isNewArrayEmpty() -> Y1
+    boolean isNeg() -> Y1
     com.android.tools.r8.ir.code.Mul asMul() -> Z
     boolean isBinop() -> Z0
-    boolean isNewArrayFilledData() -> Z1
+    boolean isNewArrayEmpty() -> Z1
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void buildCf(com.android.tools.r8.ir.conversion.CfBuilder) -> a
     void buildDex(com.android.tools.r8.ir.conversion.DexBuilder) -> a
@@ -25109,10 +25188,10 @@
     33:33:java.lang.String com.android.tools.r8.utils.CfgPrinter.makeUnusedValue():20:20 -> a
     33:33:void print(com.android.tools.r8.utils.CfgPrinter):318 -> a
     34:37:void print(com.android.tools.r8.utils.CfgPrinter):320:323 -> a
-    38:38:int com.android.tools.r8.ir.code.Value.getNumber():287:287 -> a
+    38:38:int com.android.tools.r8.ir.code.Value.getNumber():291:291 -> a
     38:38:void print(com.android.tools.r8.utils.CfgPrinter):323 -> a
     39:47:void print(com.android.tools.r8.utils.CfgPrinter):323:331 -> a
-    48:48:int com.android.tools.r8.ir.code.Value.getNumber():287:287 -> a
+    48:48:int com.android.tools.r8.ir.code.Value.getNumber():291:291 -> a
     48:48:void print(com.android.tools.r8.utils.CfgPrinter):331 -> a
     49:49:void print(com.android.tools.r8.utils.CfgPrinter):331:331 -> a
     50:51:void setNumber(int):346:347 -> a
@@ -25140,138 +25219,138 @@
     154:170:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):481 -> a
     171:172:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):487:488 -> a
     173:173:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):495:495 -> a
-    174:174:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():794:794 -> a
+    174:174:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():798:798 -> a
     174:174:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):495 -> a
-    175:175:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():794:794 -> a
+    175:175:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():798:798 -> a
     175:175:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):495 -> a
     176:182:boolean identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):499:505 -> a
     183:183:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):539:539 -> a
     184:184:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):546:546 -> a
-    185:186:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):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
+    185:186:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):1301:1302 -> a
+    187:190:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):1308:1311 -> a
+    191:193:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):1316:1318 -> a
+    194:200:boolean verifyValidPositionInfo(boolean):1385:1391 -> a
+    201:201:boolean verifyValidPositionInfo(boolean):1387:1387 -> a
     com.android.tools.r8.ir.code.Neg asNeg() -> a0
     boolean isCheckCast() -> a1
-    boolean isNewInstance() -> a2
+    boolean isNewArrayFilledData() -> a2
     com.android.tools.r8.ir.code.Add asAdd() -> b
     1:4:void addInValue(com.android.tools.r8.ir.code.Value):98:101 -> b
     5:8:void replaceValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):171:174 -> b
     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):528:528 -> b
-    18:29:boolean verifyTypes(com.android.tools.r8.graph.AppView):1319:1330 -> b
+    18:29:boolean verifyTypes(com.android.tools.r8.graph.AppView):1323:1334 -> b
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> b0
     boolean isCmp() -> b1
-    boolean isNot() -> b2
+    boolean isNewInstance() -> b2
     com.android.tools.r8.ir.code.And asAnd() -> c
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     boolean needsValueInRegister(com.android.tools.r8.ir.code.Value) -> c
     1:7:void clearUserInfo(com.android.tools.r8.ir.code.Instruction):152:158 -> c
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> c0
     boolean isConstClass() -> c1
-    boolean isNumberConversion() -> c2
+    boolean isNot() -> c2
     com.android.tools.r8.ir.code.Argument asArgument() -> d
     1:9:void removeDebugValue(com.android.tools.r8.ir.code.Value):218:226 -> d
     10:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):554:558 -> d
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> d0
     boolean isConstInstruction() -> d1
-    boolean isOr() -> d2
+    boolean isNumberConversion() -> d2
     com.android.tools.r8.ir.code.ArithmeticBinop asArithmeticBinop() -> e
     1:4:void setOutValue(com.android.tools.r8.ir.code.Value):124:127 -> e
     com.android.tools.r8.ir.code.Not asNot() -> e0
     boolean isConstMethodHandle() -> e1
-    boolean isOutConstant() -> e2
+    boolean isOr() -> e2
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> f
     1:5:com.android.tools.r8.ir.code.Value swapOutValue(com.android.tools.r8.ir.code.Value):132:136 -> f
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> f0
     boolean isConstMethodType() -> f1
-    boolean isPop() -> f2
+    boolean isOutConstant() -> f2
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> g
     com.android.tools.r8.ir.code.Or asOr() -> g0
     boolean isConstNumber() -> g1
-    boolean isRem() -> g2
+    boolean isPop() -> g2
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> h
     com.android.tools.r8.ir.code.Rem asRem() -> h0
     boolean isConstString() -> h1
-    boolean isReturn() -> h2
+    boolean isRem() -> h2
     com.android.tools.r8.ir.code.Assume asAssume() -> i
     com.android.tools.r8.ir.code.Return asReturn() -> i0
-    1:4:boolean isCreatingArray():1276:1279 -> i1
-    boolean isShl() -> i2
+    1:4:boolean isCreatingArray():1280:1283 -> i1
+    boolean isReturn() -> i2
     com.android.tools.r8.ir.code.Assume asAssumeDynamicType() -> j
     com.android.tools.r8.ir.code.Shl asShl() -> j0
-    1:1:boolean isCreatingInstanceOrArray():1283:1283 -> j1
-    boolean isShr() -> j2
+    1:1:boolean isCreatingInstanceOrArray():1287:1287 -> j1
+    boolean isShl() -> j2
     com.android.tools.r8.ir.code.Assume asAssumeNonNull() -> k
     com.android.tools.r8.ir.code.Shr asShr() -> k0
-    1:5:boolean isDebugInstruction():1080:1084 -> k1
-    boolean isStaticGet() -> k2
+    1:5:boolean isDebugInstruction():1084:1088 -> k1
+    boolean isShr() -> k2
     com.android.tools.r8.ir.code.Binop asBinop() -> l
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> l0
     boolean isDebugLocalRead() -> l1
-    boolean isStaticPut() -> l2
+    boolean isStaticGet() -> l2
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> m
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> m0
     boolean isDebugLocalUninitialized() -> m1
-    boolean isStore() -> m2
+    boolean isStaticPut() -> m2
     com.android.tools.r8.ir.code.Cmp asCmp() -> n
     com.android.tools.r8.ir.code.Store asStore() -> n0
     boolean isDebugLocalWrite() -> n1
-    boolean isStringSwitch() -> n2
+    boolean isStore() -> n2
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> o
     com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> o0
     boolean isDebugLocalsChange() -> o1
-    boolean isSub() -> o2
+    boolean isStringSwitch() -> o2
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> p
     com.android.tools.r8.ir.code.Sub asSub() -> p0
     boolean isDebugPosition() -> p1
-    boolean isSwap() -> p2
+    boolean isSub() -> p2
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> q
     com.android.tools.r8.ir.code.Switch asSwitch() -> q0
     boolean isDexItemBasedConstString() -> q1
-    boolean isSwitch() -> q2
+    boolean isSwap() -> q2
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> r
     com.android.tools.r8.ir.code.Throw asThrow() -> r0
     boolean isDiv() -> r1
-    boolean isThrow() -> r2
+    boolean isSwitch() -> r2
     com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> s
     com.android.tools.r8.ir.code.Ushr asUshr() -> s0
     boolean isDup() -> s1
-    boolean isUnop() -> s2
+    boolean isThrow() -> s2
     com.android.tools.r8.ir.code.ConstString asConstString() -> t
     com.android.tools.r8.ir.code.Xor asXor() -> t0
     boolean isDup2() -> t1
-    boolean isUshr() -> t2
+    boolean isUnop() -> t2
     1:14:java.lang.String toString():298:311 -> toString
     com.android.tools.r8.ir.code.DebugLocalWrite asDebugLocalWrite() -> u
     1:2:void clearBlock():273:274 -> u0
     1:1:boolean isFieldGet():856:856 -> u1
-    boolean isXor() -> u2
+    boolean isUshr() -> u2
     com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> v
     1:5:void clearDebugValues():245:249 -> v0
     boolean isFieldInstruction() -> v1
-    int maxInValueRegister() -> v2
+    boolean isXor() -> v2
     com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> w
-    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():1271:1271 -> w0
+    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():1275:1275 -> w0
     1:1:boolean isFieldPut():860:860 -> w1
-    int maxOutValueRegister() -> w2
+    int maxInValueRegister() -> w2
     com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> x
     1:2:com.android.tools.r8.ir.code.BasicBlock getBlock():257:258 -> x0
     boolean isGoto() -> x1
-    int opcode() -> x2
+    int maxOutValueRegister() -> x2
     com.android.tools.r8.ir.code.Div asDiv() -> y
     1:1:java.util.Set getDebugValues():599:599 -> y0
     boolean isIf() -> y1
-    1:1:com.android.tools.r8.ir.code.ValueType outType():163:163 -> y2
+    int opcode() -> y2
     com.android.tools.r8.ir.code.Dup asDup() -> z
     1:1:java.lang.String getInstructionName():293:293 -> z0
     boolean isInstanceGet() -> z1
-    1:1:com.android.tools.r8.ir.code.Value outValue():120:120 -> z2
+    1:1:com.android.tools.r8.ir.code.ValueType outType():163:163 -> z2
 com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.D.b.v0:
-    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
+    1:3:java.lang.Object com.android.tools.r8.ir.code.NextUntilIterator.nextUntil(java.util.function.Predicate):0 -> a
     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
     1:1:void remove():15:15 -> remove
@@ -25280,10 +25359,6 @@
     void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction) -> a
     com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator) -> a
     com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator) -> a
-    1:3:java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate):18:20 -> a
-    4:4:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode):99:99 -> a
-    5:5:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int):126:126 -> a
-    java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate) -> b
     void removeOrReplaceByDebugLocalRead() -> d
 com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.D.b.x0:
 com.android.tools.r8.ir.code.IntSwitch -> com.android.tools.r8.D.b.y0:
@@ -25292,14 +25367,14 @@
     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() -> C1
-    1:7:boolean valid():55:61 -> F2
     com.android.tools.r8.ir.code.IntSwitch asIntSwitch() -> G
-    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
+    1:7:boolean valid():55:61 -> G2
+    1:1:int getFirstKey():177:177 -> I2
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():214:215 -> J2
+    3:3:int getKey(int):206:206 -> J2
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216 -> J2
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216:216 -> J2
+    1:1:int[] getKeys():210:210 -> K2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> a
     1:1:void forEachCase(com.android.tools.r8.utils.IntObjConsumer):48:48 -> a
@@ -25349,34 +25424,34 @@
     5:5:int getKey(int):206:206 -> toString
     5:5:java.lang.String toString():268 -> toString
     6:11:java.lang.String toString():268:273 -> toString
-    int maxInValueRegister() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.D.b.A0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):61:61 -> <init>
-    1:1:java.util.List arguments():103:103 -> B2
-    com.android.tools.r8.graph.DexType getReturnType() -> C2
-    com.android.tools.r8.ir.code.Invoke$Type getType() -> D2
+    1:1:java.util.List arguments():103:103 -> C2
+    com.android.tools.r8.graph.DexType getReturnType() -> 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$Type getType() -> E2
+    java.lang.String getTypeString() -> F2
+    1:1:int requiredArgumentRegisters():108:108 -> G2
+    2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> G2
+    2:2:int requiredArgumentRegisters():109 -> G2
     com.android.tools.r8.ir.code.Invoke asInvoke() -> H
+    1:1:java.util.List arguments():103:103 -> H2
+    1:1:boolean argumentsAreConsecutiveInputArguments():222 -> H2
+    2:2:boolean argumentsAreConsecutiveInputArguments():222:222 -> H2
+    3:3:java.util.List arguments():103:103 -> H2
+    3:3:boolean argumentsAreConsecutiveInputArguments():225 -> H2
+    4:5:boolean argumentsAreConsecutiveInputArguments():225:226 -> H2
+    6:6:java.util.List arguments():103:103 -> H2
+    6:6:boolean argumentsAreConsecutiveInputArguments():229 -> H2
+    7:7:boolean argumentsAreConsecutiveInputArguments():229:229 -> H2
+    8:8:java.util.List arguments():103:103 -> H2
+    8:8:boolean argumentsAreConsecutiveInputArguments():230 -> H2
+    9:10:boolean argumentsAreConsecutiveInputArguments():230:231 -> H2
     boolean instructionTypeCanThrow() -> N0
     1:21:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):71:91 -> a
     22:22:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):89:89 -> a
@@ -25398,13 +25473,13 @@
     44:44:java.util.List arguments():103:103 -> a
     44:44:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):130 -> a
     45:54:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):130:139 -> a
-    55:55:int com.android.tools.r8.ir.code.Value.requiredRegisters():291:291 -> a
+    55:55:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> a
     55:55:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):140 -> a
     56:58:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):141:143 -> a
-    59:59:int com.android.tools.r8.ir.code.Value.requiredRegisters():291:291 -> a
+    59:59:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> a
     59:59:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):143 -> a
     60:60:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):143:143 -> a
-    61:61:int com.android.tools.r8.ir.code.Value.requiredRegisters():291:291 -> a
+    61:61:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> a
     61:61:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):144 -> a
     62:63:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):145:146 -> a
     64:77:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):165:178 -> a
@@ -25422,7 +25497,7 @@
     1:1:java.util.List arguments():103:103 -> b
     1:1:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):153 -> b
     2:3:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):153:154 -> b
-    4:4:int com.android.tools.r8.ir.code.Value.requiredRegisters():291:291 -> b
+    4:4:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> b
     4:4:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):154 -> b
     5:5:java.util.List arguments():103:103 -> b
     5:5:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):155 -> b
@@ -25430,7 +25505,7 @@
     7:7:java.util.List arguments():103:103 -> b
     7:7:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):156 -> b
     8:9:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):156:157 -> b
-    10:10:int com.android.tools.r8.ir.code.Value.requiredRegisters():291:291 -> b
+    10:10:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> b
     10:10:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):158 -> b
     1:1:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):240:240 -> c
     2:2:java.util.List arguments():103:103 -> c
@@ -25439,10 +25514,10 @@
     11:11:java.util.List arguments():103:103 -> c
     11:11:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):255 -> c
     12:13:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):255:256 -> c
-    1:1:java.util.List arguments():103:103 -> v2
-    1:1:int maxInValueRegister():213 -> v2
-    2:4:int maxInValueRegister():213:215 -> v2
-    int maxOutValueRegister() -> w2
+    1:1:java.util.List arguments():103:103 -> w2
+    1:1:int maxInValueRegister():213 -> w2
+    2:4:int maxInValueRegister():213:215 -> w2
+    int maxOutValueRegister() -> x2
     1:1:java.lang.String getInstructionName():269:269 -> z0
 com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.D.b.z0:
     com.android.tools.r8.ir.code.Invoke$Type NEW_ARRAY -> f
@@ -25470,11 +25545,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 -> C2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():110:110 -> D2
-    java.lang.String getTypeString() -> E2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():101:101 -> D2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():110:110 -> E2
     boolean isInvokeCustom() -> F1
-    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> G2
+    java.lang.String getTypeString() -> F2
+    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> H2
     com.android.tools.r8.ir.code.InvokeCustom asInvokeCustom() -> I
     boolean hasInvariantOutType() -> I0
     1:29:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):66:94 -> a
@@ -25514,17 +25589,17 @@
     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() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.D.b.C0:
     boolean $assertionsDisabled -> m
     boolean itf -> l
     1:1:void <clinit>():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 -> D2
-    java.lang.String getTypeString() -> E2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():67:67 -> E2
+    java.lang.String getTypeString() -> F2
     boolean isInvokeDirect() -> G1
-    1:1:boolean isInterface():57:57 -> I2
     com.android.tools.r8.ir.code.InvokeDirect asInvokeDirect() -> J
+    1:1:boolean isInterface():57:57 -> J2
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:96 -> a
     20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):113:113 -> a
     21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):159:159 -> a
@@ -25533,10 +25608,10 @@
     24:24:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeDirect):184:184 -> a
     24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):62 -> a
     25:66:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):236:277 -> a
-    67:67:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    67:67:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     67:67:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):277 -> a
     68:68:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):277:277 -> a
-    69:69:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    69:69:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     69:69:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):277 -> a
     70:70:boolean lambda$canBeDeadCode$0(java.util.List,com.android.tools.r8.ir.code.Instruction):271:271 -> a
     1:11:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):180:190 -> b
@@ -25546,13 +25621,13 @@
     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() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.D.b.D0:
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():26:26 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):29:29 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():44:44 -> D2
-    java.lang.String getTypeString() -> E2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():44:44 -> E2
+    java.lang.String getTypeString() -> F2
     boolean isInvokeInterface() -> H1
     com.android.tools.r8.ir.code.InvokeInterface asInvokeInterface() -> K
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:73 -> a
@@ -25565,67 +25640,67 @@
     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
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.D.b.E0:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexMethod method -> i
-    1:1:void <clinit>():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
+    1:1:void <clinit>():24:24 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):29:30 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getReturnType():35:35 -> D2
+    1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():39:39 -> H2
     boolean hasInvariantOutType() -> I0
     boolean isInvokeMethod() -> I1
     com.android.tools.r8.ir.code.InvokeMethod asInvokeMethod() -> L
-    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.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
+    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):44:44 -> a
+    2:2:com.android.tools.r8.graph.DexMethod getInvokedMethod():39:39 -> a
+    2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):44 -> a
+    3:8:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):79:84 -> a
     9:9:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    9:9:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):88 -> a
-    10:10:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):88:88 -> a
+    9:9:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):89 -> a
+    10:10:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):89:89 -> a
     11:11:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    11:11:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):89 -> a
-    12:13:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):89:90 -> a
+    11:11:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):90 -> a
+    12:13:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):90:91 -> a
     14:14:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    14:14:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):90 -> a
-    15:15:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):90:90 -> a
+    14:14:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):91 -> a
+    15:15:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):91:91 -> a
     16:16:boolean com.android.tools.r8.utils.InternalOptions.canHaveIncorrectJoinForArrayOfInterfacesBug():0:0 -> a
-    16:16:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):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
+    16:16:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):83 -> a
+    17:25:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):102:110 -> a
+    26:26:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):121:121 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):130:130 -> d
+    1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):131:131 -> d
     com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> e
     java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> f
-    1:1:java.lang.String toString():48:48 -> toString
+    1:1:java.lang.String toString():49:49 -> toString
 com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.D.b.F0:
     boolean $assertionsDisabled -> k
-    1:1:void <clinit>():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
+    1:1:void <clinit>():22:22 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):25:25 -> <init>
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():66:66 -> B0
+    boolean throwsOnNullInput() -> B2
+    1:2:com.android.tools.r8.ir.code.Value getReceiver():39:40 -> I2
     boolean isInvokeMethodWithReceiver() -> J1
     com.android.tools.r8.ir.code.InvokeMethodWithReceiver asInvokeMethodWithReceiver() -> M
-    1:1:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.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
+    1:1:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):50:50 -> a
+    2:2:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):56:56 -> a
+    1:15:boolean verifyTypes(com.android.tools.r8.graph.AppView):71:85 -> b
+    16:16:boolean verifyTypes(com.android.tools.r8.graph.AppView):84:84 -> b
 com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.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 -> 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
+    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> D2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():65 -> D2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():56:56 -> E2
+    java.lang.String getTypeString() -> F2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> H2
     boolean hasInvariantOutType() -> I0
+    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> I2
+    1:1:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159 -> I2
+    2:13:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159:170 -> I2
     boolean isInvokeMultiNewArray() -> K1
     com.android.tools.r8.ir.code.InvokeMultiNewArray asInvokeMultiNewArray() -> N
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:75 -> a
@@ -25652,19 +25727,19 @@
     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() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.D.b.H0:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():25:25 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,java.util.List):30:31 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> 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
+    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> D2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():46 -> D2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():55:55 -> E2
+    java.lang.String getTypeString() -> F2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> H2
     boolean hasInvariantOutType() -> I0
+    1:1:com.android.tools.r8.errors.Unreachable cfUnsupported():139:139 -> I2
     boolean isInvokeNewArray() -> L1
     com.android.tools.r8.ir.code.InvokeNewArray asInvokeNewArray() -> O
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:89 -> a
@@ -25689,69 +25764,69 @@
     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() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.D.b.I0:
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexProto proto -> k
-    1:1:void <clinit>():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
+    1:1:void <clinit>():28:28 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):33:34 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getReturnType():49:49 -> D2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():54:54 -> E2
+    java.lang.String getTypeString() -> F2
+    1:1:com.android.tools.r8.graph.DexProto getProto():63:63 -> I2
     boolean isInvokePolymorphic() -> M1
     com.android.tools.r8.ir.code.InvokePolymorphic asInvokePolymorphic() -> P
-    1:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):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
+    1:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):69:75 -> a
+    8:8:com.android.tools.r8.graph.DexProto getProto():63:63 -> a
+    8:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75 -> a
+    9:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:81 -> a
+    16:16:com.android.tools.r8.graph.DexProto getProto():63:63 -> a
+    16:16:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82 -> a
+    17:24:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:89 -> a
+    25:31:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):94:100 -> a
+    32:32:com.android.tools.r8.graph.DexProto getProto():63:63 -> a
+    32:32:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):100 -> a
+    33:34:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):100:101 -> a
+    35:37:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):106:108 -> a
+    38:40:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):149:151 -> 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
+    41:41:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):137 -> 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
+    42:42:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):44 -> a
     com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> e
     java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> f
-    int opcode() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.D.b.J0:
     boolean itf -> k
     boolean $assertionsDisabled -> l
-    1:1:void <clinit>():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
+    1:1:void <clinit>():33:33 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:39 -> <init>
+    3:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):43:44 -> <init>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():59:59 -> E2
+    java.lang.String getTypeString() -> F2
     boolean isInvokeStatic() -> N1
     com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic() -> Q
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):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
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:88 -> a
+    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):93:93 -> a
+    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):139:139 -> a
+    22:22:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):149:149 -> a
+    23:23:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):155:155 -> a
+    24:24:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):165:165 -> a
     25:25:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeStatic):209:209 -> a
-    25:25:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):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
+    25:25:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):54 -> a
+    26:26:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):212:212 -> a
+    27:27:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):223:223 -> a
+    1:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):171:208 -> b
+    1:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):108:123 -> e
+    1:2:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):132:133 -> f
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.D.b.K0:
     boolean $assertionsDisabled -> m
     boolean itf -> l
     1:1:void <clinit>():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 -> D2
-    java.lang.String getTypeString() -> E2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():46:46 -> E2
+    java.lang.String getTypeString() -> F2
     boolean isInvokeSuper() -> O1
     com.android.tools.r8.ir.code.InvokeSuper asInvokeSuper() -> R
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:75 -> a
@@ -25763,13 +25838,13 @@
     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() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.D.b.L0:
     boolean $assertionsDisabled -> l
     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
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():47:47 -> E2
+    java.lang.String getTypeString() -> F2
     boolean isInvokeVirtual() -> P1
     com.android.tools.r8.ir.code.InvokeVirtual asInvokeVirtual() -> S
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:76 -> a
@@ -25787,14 +25862,14 @@
     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
+    int opcode() -> y2
 com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.D.b.M0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.code.Value):19:19 -> <init>
     3:3:void <init>(java.util.List):23:23 -> <init>
-    com.android.tools.r8.ir.code.BasicBlock fallthroughBlock() -> B2
+    com.android.tools.r8.ir.code.BasicBlock fallthroughBlock() -> C2
     boolean hasInvariantOutType() -> I0
     boolean isJumpInstruction() -> Q1
     com.android.tools.r8.ir.code.JumpInstruction asJumpInstruction() -> T
@@ -25834,7 +25909,7 @@
     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 -> B2
+    1:1:com.android.tools.r8.ir.code.Value src():36:36 -> C2
     boolean hasInvariantOutType() -> I0
     boolean isLoad() -> R1
     com.android.tools.r8.ir.code.Load asLoad() -> U
@@ -25848,14 +25923,14 @@
     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() -> v2
-    1:1:int maxOutValueRegister():61:61 -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():61:61 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.D.b.P0:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):20:20 -> <init>
-    com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> G2
+    com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> H2
     boolean isLogicalBinop() -> S1
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> V
     com.android.tools.r8.code.Instruction CreateInt(int,int,int) -> a
@@ -25902,27 +25977,29 @@
     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>
-    boolean throwsOnNullInput() -> A2
-    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():151:151 -> B0
-    1:1:boolean isEnter():50:50 -> B2
-    1:1:com.android.tools.r8.ir.code.Value object():46:46 -> C2
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():156:156 -> B0
+    boolean throwsOnNullInput() -> B2
+    1:1:boolean isEnter():50:50 -> C2
+    1:1:com.android.tools.r8.ir.code.Value object():46:46 -> D2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     boolean isMonitor() -> T1
+    1:1:boolean isEnter():50:50 -> U1
+    1:1:boolean isMonitorEnter():103 -> U1
     com.android.tools.r8.ir.code.Monitor asMonitor() -> W
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:71 -> a
     9:9:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):77:77 -> a
-    10:10:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):131:131 -> a
-    11:11:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):136:136 -> a
-    12:12:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):141:141 -> a
-    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
+    10:10:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):136:136 -> a
+    11:11:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):141:141 -> a
+    12:12:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):146:146 -> a
+    13:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():211:211 -> a
+    13:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):114 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int maxInValueRegister() -> v2
-    1:1:int maxOutValueRegister():87:87 -> w2
-    int opcode() -> x2
-    1:7:java.lang.String getInstructionName():114:120 -> z0
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():87:87 -> x2
+    int opcode() -> y2
+    1:7:java.lang.String getInstructionName():119:125 -> z0
 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
@@ -25934,11 +26011,11 @@
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):23:23 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value dest():37:37 -> B2
-    1:1:com.android.tools.r8.ir.code.Value src():41:41 -> C2
+    1:1:com.android.tools.r8.ir.code.Value dest():37:37 -> C2
     1:2:com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction():86:87 -> D0
+    1:1:com.android.tools.r8.ir.code.Value src():41:41 -> D2
     boolean hasInvariantOutType() -> I0
-    boolean isMove() -> U1
+    boolean isMove() -> V1
     com.android.tools.r8.ir.code.Move asMove() -> X
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):46:46 -> a
@@ -25947,26 +26024,26 @@
     4:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71:71 -> a
     5:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):108:108 -> a
     6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):118:118 -> a
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMove():216:216 -> a
+    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMove():215:215 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):103 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:boolean isOutConstant():81:81 -> e2
+    1:1:boolean isOutConstant():81:81 -> f2
     1:1:java.lang.String toString():76:76 -> toString
     2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> toString
     2:2:java.lang.String toString():76 -> toString
     3:3:java.lang.String toString():76:76 -> toString
-    int maxInValueRegister() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.D.b.U0:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexType exceptionType -> h
     com.android.tools.r8.utils.InternalOptions options -> i
     1:1:void <clinit>():19:19 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):24:26 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getExceptionType():119:119 -> B2
+    1:1:com.android.tools.r8.graph.DexType getExceptionType():119:119 -> C2
     boolean hasInvariantOutType() -> I0
-    boolean isMoveException() -> V1
+    boolean isMoveException() -> W1
     com.android.tools.r8.ir.code.MoveException asMoveException() -> Y
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void buildCf(com.android.tools.r8.ir.conversion.CfBuilder) -> a
@@ -25974,7 +26051,7 @@
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45 -> a
     2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45:46 -> a
     4:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):62:65 -> a
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1391:1391 -> a
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1393:1393 -> a
     8:8:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):65 -> a
     9:9:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):66:66 -> a
     10:11:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):83:84 -> a
@@ -25983,17 +26060,17 @@
     14:14:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):115:115 -> a
     15:15: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
     15:15:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):115 -> a
-    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 com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():219:219 -> a
     16:16:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):90 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:int maxInValueRegister():51:51 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():51:51 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.D.b.V0:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> G2
-    boolean isMul() -> W1
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> H2
+    boolean isMul() -> X1
     com.android.tools.r8.ir.code.Mul asMul() -> Z
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -26011,13 +26088,13 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):79:79 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):94:94 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> f
-    int opcode() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.D.b.W0:
     com.android.tools.r8.ir.code.NumericType type -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):26:27 -> <init>
-    boolean isNeg() -> X1
+    boolean isNeg() -> Y1
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Unop.dest():21:21 -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55 -> a
@@ -26030,17 +26107,17 @@
     38:56:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):88:106 -> a
     57:57:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
     com.android.tools.r8.ir.code.Neg asNeg() -> a0
-    int opcode() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.D.b.X0:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexType type -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):25:26 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value size():49:49 -> B2
+    1:1:com.android.tools.r8.ir.code.Value size():49:49 -> C2
     boolean hasInvariantOutType() -> I0
     1:4:boolean instructionInstanceCanThrow():77:80 -> M0
     boolean instructionTypeCanThrow() -> N0
-    boolean isNewArrayEmpty() -> Y1
+    boolean isNewArrayEmpty() -> Z1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:54 -> a
     3:3:com.android.tools.r8.ir.code.Value dest():45:45 -> a
@@ -26061,9 +26138,9 @@
     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() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.D.b.Y0:
     long size -> i
     short[] data -> j
@@ -26071,10 +26148,9 @@
     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 -> B2
+    1:1:com.android.tools.r8.ir.code.Value src():47:47 -> C2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
-    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
@@ -26085,14 +26161,15 @@
     17:17:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):124 -> a
     18:21:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):125:128 -> a
     22:22:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):153:153 -> a
-    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forNewArrayFilledData():228:228 -> a
+    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forNewArrayFilledData():227:227 -> a
     23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):105 -> a
+    boolean isNewArrayFilledData() -> a2
     1:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):134:141 -> b
     boolean 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() -> v2
-    1:1:int maxOutValueRegister():83:83 -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():83:83 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.D.b.Z0:
     boolean allowSpilling -> i
     boolean $assertionsDisabled -> j
@@ -26100,9 +26177,9 @@
     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 -> B2
-    1:1:boolean isSpillingAllowed():184:184 -> C2
-    1:1:void markNoSpilling():180:180 -> D2
+    1:1:com.android.tools.r8.ir.code.Value dest():47:47 -> C2
+    1:1:boolean isSpillingAllowed():184:184 -> D2
+    1:1:void markNoSpilling():180:180 -> E2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):43:43 -> a
@@ -26120,7 +26197,6 @@
     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
@@ -26131,12 +26207,13 @@
     11:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):137:164 -> b
     39:39:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):142:142 -> b
     40:40:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):195:195 -> b
+    boolean isNewInstance() -> b2
     1:11:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):189:199 -> c
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> d0
     1:1:java.lang.String toString():58:58 -> toString
-    1:1:int maxInValueRegister():68:68 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():68:68 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Not -> com.android.tools.r8.D.b.a1:
     com.android.tools.r8.ir.code.NumericType type -> h
     boolean $assertionsDisabled -> i
@@ -26152,9 +26229,9 @@
     38:38:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83:83 -> a
     39:39:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):99:99 -> a
     40:40:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):105:105 -> a
-    boolean isNot() -> b2
+    boolean isNot() -> c2
     com.android.tools.r8.ir.code.Not asNot() -> e0
-    int opcode() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.D.b.b1:
     com.android.tools.r8.ir.code.NumericType to -> i
     com.android.tools.r8.ir.code.NumericType from -> h
@@ -26183,9 +26260,9 @@
     219:219:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):157:157 -> a
     220:220:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):162:162 -> a
     221:221:boolean outTypeKnownToBeBoolean(java.util.Set):167:167 -> a
-    boolean isNumberConversion() -> c2
+    boolean isNumberConversion() -> d2
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> f0
-    int opcode() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.D.b.c1:
     com.android.tools.r8.ir.code.NumericType DOUBLE -> g
     com.android.tools.r8.ir.code.NumericType FLOAT -> f
@@ -26214,8 +26291,8 @@
     60:60:boolean isWide():62:62 -> a
 com.android.tools.r8.ir.code.Or -> com.android.tools.r8.D.b.d1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> G2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -26227,9 +26304,9 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):63:63 -> c
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):68:68 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
-    boolean isOr() -> d2
+    boolean isOr() -> e2
     com.android.tools.r8.ir.code.Or asOr() -> g0
-    int opcode() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.D.b.f1:
     com.android.tools.r8.ir.code.Phi$RegisterReadType readType -> t
     java.util.List definitionUsers -> v
@@ -26289,7 +26366,7 @@
     127:127:void addDefinitionsUser(java.util.Map):327:327 -> a
     128:131:void lambda$verifyIsStackPhi$0(java.util.Set,com.android.tools.r8.ir.code.Value):357:360 -> a
     132:132:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):376:376 -> a
-    133:133:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():794:794 -> a
+    133:133:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():798:798 -> a
     133:133:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):376 -> a
     134:142:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):376:384 -> a
     1:3:void abortOnInvalidDebugInfo(com.android.tools.r8.ir.code.ValueTypeConstraint):83:85 -> b
@@ -26308,7 +26385,7 @@
     1:1:java.util.List getOperands():171:171 -> d0
     1:1:boolean isTrivialPhi():212:212 -> e0
     1:9:java.lang.String printPhi():302:310 -> f0
-    10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():1186:1186 -> f0
+    10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():1199:1199 -> f0
     10:10:java.lang.String printPhi():310 -> f0
     11:12:java.lang.String printPhi():310:311 -> f0
     1:1:void removeDeadPhi():292:292 -> g0
@@ -26336,14 +26413,14 @@
     4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):80 -> a
     5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):80:80 -> a
     6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):85:85 -> a
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forPop():240:240 -> a
+    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forPop():239:239 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):70 -> a
     1: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() -> f2
-    1:1:int maxInValueRegister():59:59 -> v2
-    1:1:int maxOutValueRegister():64:64 -> w2
-    int opcode() -> x2
+    boolean isPop() -> g2
+    1:1:int maxInValueRegister():59:59 -> w2
+    1:1:int maxOutValueRegister():64:64 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Position -> com.android.tools.r8.D.b.h1:
     com.android.tools.r8.ir.code.Position NO_POSITION_SYNTHETIC -> g
     com.android.tools.r8.graph.DexString file -> b
@@ -26370,8 +26447,8 @@
     1:19:java.lang.String toString():151 -> toString
 com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.D.b.i1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> G2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> H2
     1:1:boolean instructionTypeCanThrow():134:134 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -26390,17 +26467,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() -> g2
     com.android.tools.r8.ir.code.Rem asRem() -> h0
-    int opcode() -> x2
+    boolean isRem() -> h2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Return -> com.android.tools.r8.D.b.j1:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():24:24 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.code.Value):28:28 -> <init>
-    1:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getReturnType():46:47 -> C2
-    1:1:boolean isReturnVoid():42:42 -> D2
-    1:2:com.android.tools.r8.ir.code.Value returnValue():51:52 -> E2
+    1:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getReturnType():46:47 -> D2
+    1:1:boolean isReturnVoid():42:42 -> E2
+    1:2:com.android.tools.r8.ir.code.Value returnValue():51:52 -> F2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
     2:9:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80:87 -> a
@@ -26409,18 +26486,18 @@
     13:14:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):119:120 -> a
     15:17:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):127:129 -> a
     18:18:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):126:126 -> a
-    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 com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():243:243 -> 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() -> h2
     com.android.tools.r8.ir.code.Return asReturn() -> i0
-    int maxInValueRegister() -> v2
-    1:1:int maxOutValueRegister():97:97 -> w2
-    int opcode() -> x2
+    boolean isReturn() -> i2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():97:97 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.D.b.k1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> G2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -26432,13 +26509,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() -> i2
     com.android.tools.r8.ir.code.Shl asShl() -> j0
-    int opcode() -> x2
+    boolean isShl() -> j2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.D.b.l1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> G2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -26450,9 +26527,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() -> j2
     com.android.tools.r8.ir.code.Shr asShr() -> k0
-    int opcode() -> x2
+    boolean isShr() -> k2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.D.b.m1:
     int decodedValue() -> a
 com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.D.b.n1:
@@ -26468,7 +26545,7 @@
     4:4:com.android.tools.r8.ir.code.StackValue create(com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo,int,com.android.tools.r8.graph.AppView):26 -> a
     5:5:com.android.tools.r8.ir.code.StackValue create(com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo,int,com.android.tools.r8.graph.AppView):26:26 -> a
     6:6:com.android.tools.r8.ir.code.StackValue duplicate(int):39:39 -> a
-    7:7:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():1186:1186 -> a
+    7:7:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():1199:1199 -> a
     7:7:com.android.tools.r8.ir.code.StackValue duplicate(int):39 -> a
     8:8:com.android.tools.r8.ir.code.StackValue duplicate(int):39:39 -> a
     9:9:void setNeedsRegister(boolean):54:54 -> a
@@ -26490,8 +26567,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 -> D2
-    1:1:com.android.tools.r8.ir.code.Value dest():49:49 -> E2
+    1:1:com.android.tools.r8.ir.code.Value value():54:54 -> E2
+    1:1:com.android.tools.r8.ir.code.Value dest():49:49 -> F2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):45:45 -> a
     2:2:com.android.tools.r8.ir.code.Value dest():49:49 -> a
@@ -26522,17 +26599,17 @@
     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() -> k2
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> l0
+    boolean isStaticGet() -> l2
     1:1:java.lang.String toString():160:160 -> toString
-    int maxInValueRegister() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.D.b.q1:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():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
+    1:2:com.android.tools.r8.ir.code.Value value():54:55 -> E2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):49:49 -> a
     2:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):61:88 -> a
@@ -26558,28 +26635,28 @@
     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:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     35:35:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):145 -> b
     35:35:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
     36:53:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):146:163 -> b
     36:53:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
     54:54:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):162:162 -> b
     54:54:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
-    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     55:55:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):145 -> b
     55:55:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
     1:5:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):269:273 -> c
-    boolean isStaticPut() -> l2
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> m0
+    boolean isStaticPut() -> m2
     1:1:java.lang.String toString():231:231 -> toString
-    int maxInValueRegister() -> v2
-    1:1:int maxOutValueRegister():190:190 -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():190:190 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Store -> com.android.tools.r8.D.b.r1:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.StackValue):23:23 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value src():37:37 -> B2
+    1:1:com.android.tools.r8.ir.code.Value src():37:37 -> C2
     boolean hasInvariantOutType() -> I0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):52:52 -> a
@@ -26592,21 +26669,21 @@
     7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):88:88 -> a
     8:8:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):93:93 -> a
     9:9:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):103:103 -> a
-    10:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStore():260:260 -> a
+    10:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStore():259:259 -> a
     10:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):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() -> m2
     com.android.tools.r8.ir.code.Store asStore() -> n0
-    1:1:int maxInValueRegister():57:57 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    boolean isStore() -> n2
+    1:1:int maxInValueRegister():57:57 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.D.b.s1:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexString[] keys -> l
     1:1:void <clinit>():15:15 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexString[],int[],int):21:23 -> <init>
-    1:4:boolean valid():44:47 -> F2
+    1:4:boolean valid():44:47 -> G2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:void forEachCase(java.util.function.BiConsumer):37:37 -> a
     2:2:com.android.tools.r8.graph.DexString getKey(int):62:62 -> a
@@ -26616,22 +26693,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() -> n2
     com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> o0
+    boolean isStringSwitch() -> o2
     1:4:java.lang.String toString():67:70 -> toString
     5:5:com.android.tools.r8.graph.DexString getKey(int):62:62 -> toString
     5:5:java.lang.String toString():71 -> toString
     6:11:java.lang.String toString():71:76 -> toString
-    1:1:int maxInValueRegister():101:101 -> v2
-    1:1:int maxOutValueRegister():106:106 -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():101:101 -> w2
+    1:1:int maxOutValueRegister():106:106 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.D.b.t1:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):27:27 -> <init>
-    boolean isCommutative() -> C2
-    1:8:int maxInOutValueRegisterSize():131:138 -> E2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> G2
+    boolean isCommutative() -> D2
+    1:8:int maxInOutValueRegisterSize():131:138 -> F2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
@@ -26655,9 +26732,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() -> o2
     com.android.tools.r8.ir.code.Sub asSub() -> p0
-    int opcode() -> x2
+    boolean isSub() -> p2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.D.b.u1:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():19:19 -> <clinit>
@@ -26669,33 +26746,33 @@
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:67 -> a
     2:2:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):72:72 -> a
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):77:77 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forSwap():264:264 -> a
+    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forSwap():263:263 -> 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):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() -> p2
-    int maxInValueRegister() -> v2
-    1:1:int maxOutValueRegister():87:87 -> w2
-    int opcode() -> x2
+    boolean isSwap() -> q2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():87:87 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.D.b.v1:
     int[] targetBlockIndices -> i
     int fallthroughBlockIndex -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():9:9 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,int[],int):15:17 -> <init>
-    1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():51:51 -> 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:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():51:51 -> C2
+    1:1:int getFallthroughBlockIndex():55:55 -> D2
+    1:1:int numberOfKeys():68:68 -> E2
+    1:1:int[] targetBlockIndices():40:40 -> F2
+    1:1:int numberOfKeys():68:68 -> G2
+    1:1:boolean valid():25 -> G2
+    2:2:boolean valid():26:26 -> G2
+    3:3:int getTargetBlockIndex(int):36:36 -> G2
+    3:3:boolean valid():26 -> G2
+    4:4:int getFallthroughBlockIndex():55:55 -> G2
+    4:4:boolean valid():26 -> G2
+    5:5:boolean valid():26:26 -> G2
+    1:1:com.android.tools.r8.ir.code.Value value():21:21 -> H2
     1:1:int getTargetBlockIndex(int):36:36 -> b
     2:2:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):64:64 -> b
     1:1:void setFallthroughBlockIndex(int):59:59 -> c
@@ -26704,12 +26781,12 @@
     2:2:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):32 -> d
     3:3:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):32:32 -> d
     com.android.tools.r8.ir.code.Switch asSwitch() -> q0
-    boolean isSwitch() -> q2
+    boolean isSwitch() -> r2
 com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.D.b.w1:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value exception():34:34 -> C2
+    1:1:com.android.tools.r8.ir.code.Value exception():34:34 -> D2
     boolean instructionTypeCanThrow() -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):39:39 -> a
@@ -26720,34 +26797,34 @@
     10:10:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
     10:10:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):99 -> a
     11:11:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104:104 -> a
-    12:12:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    12:12:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     12:12:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104 -> a
     13:16:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):105:108 -> a
-    17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     17:17:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104 -> a
-    18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forThrow():268:268 -> a
+    18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forThrow():267:267 -> a
     18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):76 -> a
     com.android.tools.r8.ir.code.Throw asThrow() -> r0
-    boolean isThrow() -> r2
-    int maxInValueRegister() -> v2
-    1:1:int maxOutValueRegister():49:49 -> w2
-    int opcode() -> x2
+    boolean isThrow() -> s2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():49:49 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.D.b.x1:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value source():25:25 -> B2
+    1:1:com.android.tools.r8.ir.code.Value source():25:25 -> C2
     boolean hasInvariantOutType() -> I0
     1:2:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):56:57 -> a
     3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):62:62 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():272:272 -> a
+    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():271:271 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):51 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isUnop() -> s2
-    int maxInValueRegister() -> v2
-    int maxOutValueRegister() -> w2
+    boolean isUnop() -> t2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
 com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.D.b.y1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> G2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -26760,8 +26837,8 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):58:58 -> d
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
     com.android.tools.r8.ir.code.Ushr asUshr() -> s0
-    boolean isUshr() -> t2
-    int opcode() -> x2
+    boolean isUshr() -> u2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Value -> com.android.tools.r8.D.b.B1:
     int needsRegister -> j
     boolean isThis -> k
@@ -26783,37 +26860,37 @@
     1:165:void <clinit>():40:204 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):223:223 -> <init>
     2:20:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):208:226 -> <init>
-    1:1:boolean isConstClass():823:823 -> A
-    1:1:boolean isConstNumber():803:803 -> B
-    1:1:boolean isConstString():807:807 -> C
-    1:1:boolean isConstant():827:827 -> D
-    1:1:boolean isDexItemBasedConstString():811:811 -> E
+    1:1:boolean isConstClass():827:827 -> A
+    1:1:boolean isConstNumber():807:807 -> B
+    1:1:boolean isConstString():811:811 -> C
+    1:1:boolean isConstant():831:831 -> D
+    1:1:boolean isDexItemBasedConstString():815:815 -> E
     boolean isFixedRegisterValue() -> F
-    1:1:boolean isLinked():388:388 -> G
-    1:3:boolean isNeverNull():987:989 -> H
+    1:1:boolean isLinked():392:392 -> G
+    1:3:boolean isNeverNull():991:993 -> H
     boolean isPhi() -> I
-    1:1:boolean isThis():1050:1050 -> J
-    1:1:boolean isUsed():489:489 -> K
+    1:1:boolean isThis():1063:1063 -> J
+    1:1:boolean isUsed():493:493 -> K
     boolean isValueOnStack() -> L
-    1:3:boolean isZero():1143:1145 -> M
-    1:3:void markAsArgument():998:1000 -> N
-    1:3:void markAsThis():1039:1041 -> O
+    1:3:boolean isZero():1156:1158 -> M
+    1:3:void markAsArgument():997:999 -> N
+    1:3:void markAsThis():1052:1054 -> O
     1:1:void markNonDebugLocalRead():137:137 -> P
-    1:3:boolean needsRegister():715:717 -> Q
-    1:1:int numberOfAllNonDebugUsers():477:477 -> R
-    1:1:int numberOfAllUsers():485 -> R
-    2:2:int numberOfAllUsers():485:485 -> R
-    1:1:int numberOfDebugUsers():481:481 -> S
-    1:5:int numberOfPhiUsers():469:473 -> T
-    1:5:int numberOfUsers():461:465 -> U
-    1:1:com.android.tools.r8.ir.code.ValueType outType():794:794 -> V
-    1:1:int requiredRegisters():291:291 -> W
-    1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():424:425 -> X
-    1:4:java.util.Set uniquePhiUsers():450:453 -> Y
-    1:4:java.util.Set uniqueUsers():417:420 -> Z
+    1:3:boolean needsRegister():719:721 -> Q
+    1:1:int numberOfAllNonDebugUsers():481:481 -> R
+    1:1:int numberOfAllUsers():489 -> R
+    2:2:int numberOfAllUsers():489:489 -> R
+    1:1:int numberOfDebugUsers():485:485 -> S
+    1:5:int numberOfPhiUsers():473:477 -> T
+    1:5:int numberOfUsers():465:469 -> U
+    1:1:com.android.tools.r8.ir.code.ValueType outType():798:798 -> V
+    1:1:int requiredRegisters():295:295 -> W
+    1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():428:429 -> X
+    1:4:java.util.Set uniquePhiUsers():454:457 -> Y
+    1:4:java.util.Set uniqueUsers():421:424 -> Z
     boolean lambda$fullyRemovePhiUser$1(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi) -> a
     1:13:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.Reporter):44:56 -> a
-    14:14:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1154:1154 -> a
+    14:14:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167:1167 -> a
     14:14:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.Reporter):57 -> a
     15:15:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.Reporter):46:46 -> a
     16:18:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
@@ -26830,138 +26907,157 @@
     117:117:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):128:128 -> a
     118:118:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueTypeConstraint):132:132 -> a
     118:118:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):128 -> a
-    119:119:com.android.tools.r8.ir.code.Value getAliasedValue():253:253 -> 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
-    150:150:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    150:150:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):844 -> a
-    151:152:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):844:845 -> a
-    153:153:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    153:153:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):849 -> a
-    154:157:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):849:852 -> a
-    158:158:com.android.tools.r8.ir.code.Value getAliasedValue():253:253 -> a
-    158:158:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):852 -> a
-    159:189:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):853:883 -> a
-    190:190:com.android.tools.r8.ir.code.Value getAliasedValue():253:253 -> a
-    190:190:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):883 -> a
-    191:205:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):890:904 -> a
-    206:206:com.android.tools.r8.ir.code.Value getAliasedValue():253:253 -> a
-    206:206:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):883 -> a
-    207:266:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):908:967 -> a
-    267:267:com.android.tools.r8.ir.code.Value getAliasedValue():253:253 -> a
-    267:267:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):852 -> a
-    268:288:com.android.tools.r8.ir.code.Value getAliasedValue(java.util.function.Predicate):257:277 -> a
-    289:291:void setLocalInfo(com.android.tools.r8.graph.DebugLocalInfo):303:305 -> a
-    292:295:boolean hasSameOrNoLocal(com.android.tools.r8.ir.code.Value):314:317 -> a
-    296:297:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):357:358 -> a
-    298:299:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):362:363 -> a
-    298:299:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):358 -> a
-    300:308:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():172:180 -> a
-    300:308:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):363 -> a
-    300:308:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):358 -> a
-    309:309:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():178:178 -> a
-    309:309:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):363 -> a
-    309:309:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):358 -> a
-    310:310:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():175:175 -> a
-    310:310:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):363 -> a
-    310:310:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):358 -> a
-    311:311:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):358:358 -> a
-    312:313:boolean onlyUsedInBlock(com.android.tools.r8.ir.code.BasicBlock):408:409 -> a
-    314:315:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):436:437 -> a
-    316:316:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    316:316:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):438 -> a
-    317:317:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):438:438 -> a
-    318:318:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    318:318:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):439 -> a
-    319:319:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):439:439 -> a
-    320:321:void addPhiUser(com.android.tools.r8.ir.code.Phi):555:556 -> a
-    322:323:java.util.Set affectedValues():606:607 -> a
-    324:324:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    324:324:java.util.Set affectedValues():608 -> a
-    325:329:java.util.Set affectedValues():609:613 -> a
-    330:357:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):645:672 -> a
-    358:367:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):679:688 -> a
-    368:381:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.join(com.android.tools.r8.ir.code.Value$DebugUse,com.android.tools.r8.ir.code.Value$DebugUse):185:198 -> a
-    368:381:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):688 -> a
-    382:382:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.join(com.android.tools.r8.ir.code.Value$DebugUse,com.android.tools.r8.ir.code.Value$DebugUse):186:186 -> a
-    382:382:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):688 -> a
-    383:383:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):688:688 -> a
-    384:392:void replaceDebugUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):693:701 -> a
-    393:394:void setLiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):706:707 -> a
-    395:396:void setNeedsRegister(boolean):721:722 -> a
-    397:419:boolean knownToBeBoolean(java.util.Set):1013:1035 -> a
-    420:420:void setValueRange(com.android.tools.r8.utils.LongInterval):1054:1054 -> a
-    421:421:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate):1091:1091 -> a
-    422:438:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1108:1124 -> a
-    439:439:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    439:439:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1127 -> a
-    440:446:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1129:1135 -> a
-    447:447:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1154:1154 -> a
-    448:450:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1173:1175 -> a
-    451:459:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1173:1181 -> a
-    460:460:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1154:1154 -> a
-    460:460:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1182 -> a
-    1:2:boolean usedInMonitorOperation():521:522 -> a0
+    119:119:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> a
+    119:119:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1235 -> a
+    120:138:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1236:1254 -> a
+    139:139:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
+    139:139:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1254 -> a
+    140:140:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
+    140:140:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1254 -> a
+    141:141:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1255:1255 -> a
+    142:142:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> a
+    142:142:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):835 -> a
+    143:154:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):836:847 -> a
+    155:155:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
+    155:155:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):848 -> a
+    156:157:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):848:849 -> a
+    158:158:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
+    158:158:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):853 -> a
+    159:162:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):853:856 -> a
+    163:163:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> a
+    163:163:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):856 -> a
+    164:194:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):857:887 -> a
+    195:195:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> a
+    195:195:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):887 -> a
+    196:210:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):894:908 -> a
+    211:211:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> a
+    211:211:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):887 -> a
+    212:271:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):912:971 -> a
+    272:272:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> a
+    272:272:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):856 -> a
+    273:293:com.android.tools.r8.ir.code.Value getAliasedValue(java.util.function.Predicate):261:281 -> a
+    294:296:void setLocalInfo(com.android.tools.r8.graph.DebugLocalInfo):307:309 -> a
+    297:300:boolean hasSameOrNoLocal(com.android.tools.r8.ir.code.Value):318:321 -> a
+    301:302:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):361:362 -> a
+    303:304:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):366:367 -> a
+    303:304:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362 -> a
+    305:313:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():172:180 -> a
+    305:313:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):367 -> a
+    305:313:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362 -> a
+    314:314:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():178:178 -> a
+    314:314:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):367 -> a
+    314:314:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362 -> a
+    315:315:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():175:175 -> a
+    315:315:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):367 -> a
+    315:315:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362 -> a
+    316:316:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362:362 -> a
+    317:318:boolean onlyUsedInBlock(com.android.tools.r8.ir.code.BasicBlock):412:413 -> a
+    319:320:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):440:441 -> a
+    321:321:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    321:321:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):442 -> a
+    322:322:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):442:442 -> a
+    323:323:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    323:323:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):443 -> a
+    324:324:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):443:443 -> a
+    325:326:void addPhiUser(com.android.tools.r8.ir.code.Phi):559:560 -> a
+    327:328:java.util.Set affectedValues():610:611 -> a
+    329:329:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    329:329:java.util.Set affectedValues():612 -> a
+    330:334:java.util.Set affectedValues():613:617 -> a
+    335:362:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):649:676 -> a
+    363:372:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):683:692 -> a
+    373:386:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.join(com.android.tools.r8.ir.code.Value$DebugUse,com.android.tools.r8.ir.code.Value$DebugUse):185:198 -> a
+    373:386:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):692 -> a
+    387:387:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.join(com.android.tools.r8.ir.code.Value$DebugUse,com.android.tools.r8.ir.code.Value$DebugUse):186:186 -> a
+    387:387:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):692 -> a
+    388:388:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):692:692 -> a
+    389:397:void replaceDebugUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):697:705 -> a
+    398:399:void setLiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):710:711 -> a
+    400:401:void setNeedsRegister(boolean):725:726 -> a
+    402:404:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):1007:1009 -> a
+    405:405:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> a
+    405:405:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):1009 -> a
+    406:408:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):1010:1012 -> a
+    409:409:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    409:409:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):1013 -> a
+    410:410:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):1018:1018 -> a
+    411:411:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> a
+    411:411:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):1009 -> a
+    412:434:boolean knownToBeBoolean(java.util.Set):1026:1048 -> a
+    435:435:void setValueRange(com.android.tools.r8.utils.LongInterval):1067:1067 -> a
+    436:436:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate):1104:1104 -> a
+    437:453:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1121:1137 -> a
+    454:454:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    454:454:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1140 -> a
+    455:461:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1142:1148 -> a
+    462:462:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167:1167 -> a
+    463:465:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1186:1188 -> a
+    466:474:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1186:1194 -> a
+    475:475:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167:1167 -> a
+    475:475:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1195 -> a
+    1:2:boolean usedInMonitorOperation():525:526 -> a0
     boolean lambda$fullyRemoveUser$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> b
-    1:2:com.android.tools.r8.ir.code.Value getSpecificAliasedValue(java.util.function.Predicate):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: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
+    1:2:com.android.tools.r8.ir.code.Value getSpecificAliasedValue(java.util.function.Predicate):286:287 -> b
+    3:6:void linkTo(com.android.tools.r8.ir.code.Value):371:374 -> b
+    7:8:java.util.Set aliasedUsers():433:434 -> b
+    9:10:void removePhiUser(com.android.tools.r8.ir.code.Phi):564:565 -> b
+    11:12:void addDebugUser(com.android.tools.r8.ir.code.Instruction):574:575 -> b
+    13:13:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):1099:1099 -> b
+    14:20:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1173:1179 -> b
+    21:21:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167:1167 -> b
+    21:21:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1180 -> b
+    22:40:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1206:1224 -> b
+    41:41:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> b
+    41:41:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1224 -> b
+    42:42:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable() -> b
+    42:42:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1224 -> b
+    43:45:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1226:1228 -> b
     com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue() -> c
-    1: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:10:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):493:497 -> c
+    1:1:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> c
+    1:1:boolean mayDependOnEnvironment(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):514 -> c
+    2:5:boolean mayDependOnEnvironment(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):515:518 -> c
+    6:10:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):497:501 -> c
     11:11:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> c
-    11:11:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):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
+    11:11:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):501 -> c
+    12:16:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):504:508 -> c
+    17:18:void addUser(com.android.tools.r8.ir.code.Instruction):534:535 -> c
+    19:20:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):569:570 -> c
+    21:33:void replaceUsers(com.android.tools.r8.ir.code.Value):624:636 -> c
     com.android.tools.r8.ir.code.Phi asPhi() -> d
-    1:5:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):583:587 -> d
-    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
+    1:5:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):587:591 -> d
+    6:6:boolean lambda$getDynamicLowerBoundType$4(com.android.tools.r8.ir.code.Value):1250:1250 -> d
+    1:2:void removeUser(com.android.tools.r8.ir.code.Instruction):539:540 -> e
+    3:8:void clearUsers():549:554 -> e
+    9:9:boolean lambda$getDynamicUpperBoundType$3(com.android.tools.r8.ir.code.Value):1207:1207 -> e
     boolean lambda$replaceSelectiveUsers$2(com.android.tools.r8.ir.code.Value) -> f
-    1:2:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):540:541 -> f
-    3:8:void clearUsersInfo():595:600 -> f
-    1:2:void computeNeedsRegister():726:727 -> g
-    1:1:java.util.Set debugUsers():457:457 -> h
-    1:1:int hashCode():760:760 -> hashCode
-    1:2:com.android.tools.r8.ir.code.Phi firstPhiUser():445:446 -> i
-    1:1:com.android.tools.r8.ir.code.Value getAliasedValue():253:253 -> j
-    1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():798:799 -> k
-    1:7:java.util.List getDebugLocalEnds():334:340 -> l
-    1:7:java.util.List getDebugLocalStarts():321:327 -> m
+    1:2:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):544:545 -> f
+    3:8:void clearUsersInfo():599:604 -> f
+    1:2:void computeNeedsRegister():730:731 -> g
+    1:1:java.util.Set debugUsers():461:461 -> h
+    1:1:int hashCode():764:764 -> hashCode
+    1:2:com.android.tools.r8.ir.code.Phi firstPhiUser():449:450 -> i
+    1:1:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> j
+    1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():802:803 -> k
+    1:7:java.util.List getDebugLocalEnds():338:344 -> l
+    1:7:java.util.List getDebugLocalStarts():325:331 -> m
     1:2:com.android.tools.r8.ir.code.Instruction getDefinition():238:239 -> n
-    1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():711:711 -> o
-    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():295:295 -> p
-    1:1:com.android.tools.r8.ir.code.Value getNextConsecutive():400:400 -> q
-    1:1:int getNumber():287:287 -> r
-    1:1:com.android.tools.r8.ir.code.Value getPreviousConsecutive():404:404 -> s
-    1:1:com.android.tools.r8.ir.code.Value getStartOfConsecutive():393 -> s
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice():1186:1186 -> t
-    1:8:java.lang.String toString():765:772 -> toString
+    1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():715:715 -> o
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():299:299 -> p
+    1:1:com.android.tools.r8.ir.code.Value getNextConsecutive():404:404 -> q
+    1:1:int getNumber():291:291 -> r
+    1:1:com.android.tools.r8.ir.code.Value getPreviousConsecutive():408:408 -> s
+    1:1:com.android.tools.r8.ir.code.Value getStartOfConsecutive():397 -> s
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice():1199:1199 -> t
+    1:8:java.lang.String toString():769:776 -> toString
     9:9:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> toString
-    9:9:java.lang.String toString():773 -> toString
-    10:27:java.lang.String toString():773:790 -> toString
-    1:11:com.android.tools.r8.utils.LongInterval getValueRange():1070:1080 -> u
-    1:1:boolean hasLocalInfo():299:299 -> v
-    1:1:boolean hasUsersInfo():591:591 -> w
-    1:1:boolean hasValueRange():1058:1058 -> x
-    1:8:boolean internalComputeNeedsRegister():731:738 -> y
-    1:1:boolean isArgument():1004:1004 -> z
+    9:9:java.lang.String toString():777 -> toString
+    10:27:java.lang.String toString():777:794 -> toString
+    1:11:com.android.tools.r8.utils.LongInterval getValueRange():1083:1093 -> u
+    1:1:boolean hasLocalInfo():303:303 -> v
+    1:1:boolean hasUsersInfo():595:595 -> w
+    1:1:boolean hasValueRange():1071:1071 -> x
+    1:8:boolean internalComputeNeedsRegister():735:742 -> y
+    1:1:boolean isArgument():1003:1003 -> z
 com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.D.b.z1:
     java.util.Map users -> b
     com.android.tools.r8.graph.DebugLocalInfo local -> a
@@ -27065,8 +27161,8 @@
     long decodedValue() -> a
 com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.D.b.G1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> G2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -27079,8 +27175,8 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):68:68 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
     com.android.tools.r8.ir.code.Xor asXor() -> t0
-    boolean isXor() -> u2
-    int opcode() -> x2
+    boolean isXor() -> v2
+    int opcode() -> y2
 com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver -> com.android.tools.r8.D.c.c:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
@@ -27179,53 +27275,53 @@
     int maxDepth -> h
     int currentDepth -> g
     java.util.Map removedEdges -> f
-    1:1:void <clinit>():294:294 -> <clinit>
-    1:1:void <init>(java.util.Collection,com.android.tools.r8.utils.InternalOptions):353:353 -> <init>
-    2:23:void <init>(java.util.Collection,com.android.tools.r8.utils.InternalOptions):339:360 -> <init>
-    1:8:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult breakCycles():365:372 -> a
-    9:14:void reset():379:384 -> a
-    9:14:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult breakCycles():374 -> a
-    15:15:boolean edgeRemovalIsSafe(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):531:531 -> a
-    16:16:void recordEdgeRemoval(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):535:535 -> a
-    17:19:java.util.Collection reorderNodes(java.util.List):546:548 -> a
-    1:1:java.util.Set lambda$recordEdgeRemoval$0(com.android.tools.r8.ir.conversion.CallGraph$Node):535:535 -> b
-    1:7:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):388:394 -> c
-    8:10:void push(com.android.tools.r8.ir.conversion.CallGraph$Node):491:493 -> c
-    8:10:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):399 -> c
-    11:91:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):403:483 -> c
-    92:110:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):423:441 -> c
-    111:118:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):437:444 -> c
-    119:123:java.util.LinkedList extractCycle(com.android.tools.r8.ir.conversion.CallGraph$Node):504:508 -> c
-    119:123:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):447 -> c
-    124:125:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):449:450 -> c
-    126:134:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):513:521 -> c
-    126:134:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):456 -> c
-    135:147:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):461:473 -> c
-    148:148:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):468:468 -> c
-    149:151:void recoverStack(java.util.LinkedList):539:541 -> c
-    149:151:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):478 -> c
-    152:152:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):525:525 -> c
-    152:152:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):456 -> c
+    1:1:void <clinit>():302:302 -> <clinit>
+    1:1:void <init>(java.util.Collection,com.android.tools.r8.utils.InternalOptions):361:361 -> <init>
+    2:23:void <init>(java.util.Collection,com.android.tools.r8.utils.InternalOptions):347:368 -> <init>
+    1:8:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult breakCycles():373:380 -> a
+    9:14:void reset():387:392 -> a
+    9:14:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult breakCycles():382 -> a
+    15:15:boolean edgeRemovalIsSafe(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):539:539 -> a
+    16:16:void recordEdgeRemoval(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):543:543 -> a
+    17:19:java.util.Collection reorderNodes(java.util.List):554:556 -> a
+    1:1:java.util.Set lambda$recordEdgeRemoval$0(com.android.tools.r8.ir.conversion.CallGraph$Node):543:543 -> b
+    1:7:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):396:402 -> c
+    8:10:void push(com.android.tools.r8.ir.conversion.CallGraph$Node):499:501 -> c
+    8:10:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):407 -> c
+    11:91:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):411:491 -> c
+    92:110:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):431:449 -> c
+    111:118:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):445:452 -> c
+    119:123:java.util.LinkedList extractCycle(com.android.tools.r8.ir.conversion.CallGraph$Node):512:516 -> c
+    119:123:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):455 -> c
+    124:125:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):457:458 -> c
+    126:134:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):521:529 -> c
+    126:134:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):464 -> c
+    135:147:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):469:481 -> c
+    148:148:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):476:476 -> c
+    149:151:void recoverStack(java.util.LinkedList):547:549 -> c
+    149:151:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):486 -> c
+    152:152:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):533:533 -> c
+    152:152:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):464 -> c
     153:153:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> c
-    153:153:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):525 -> c
-    153:153:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):456 -> c
-    154:154:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):525:525 -> c
-    154:154:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):456 -> c
-    155:158:void pop(com.android.tools.r8.ir.conversion.CallGraph$Node):497:500 -> c
-    155:158:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):486 -> c
-    159:159:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):487:487 -> c
+    153:153:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):533 -> c
+    153:153:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):464 -> c
+    154:154:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):533:533 -> c
+    154:154:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):464 -> c
+    155:158:void pop(com.android.tools.r8.ir.conversion.CallGraph$Node):505:508 -> c
+    155:158:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):494 -> c
+    159:159:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):495:495 -> c
 com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge -> com.android.tools.r8.D.c.f:
     com.android.tools.r8.ir.conversion.CallGraph$Node callee -> b
     com.android.tools.r8.ir.conversion.CallGraph$Node caller -> a
-    1:3:void <init>(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):304:306 -> <init>
-    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$300(com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge):299:299 -> a
-    2:2:void remove():310:310 -> a
-    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$400(com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge):299:299 -> b
+    1:3:void <init>(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):312:314 -> <init>
+    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$300(com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge):307:307 -> a
+    2:2:void remove():318:318 -> a
+    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$400(com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge):307:307 -> b
 com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult -> com.android.tools.r8.D.c.g:
     java.util.Map removedEdges -> a
-    1:2:void <init>(java.util.Map):318:319 -> <init>
-    1:1:void forEachRemovedCaller(com.android.tools.r8.ir.conversion.CallGraph$Node,java.util.function.Consumer):323:323 -> a
-    2:3:int numberOfRemovedEdges():328:329 -> a
+    1:2:void <init>(java.util.Map):326:327 -> <init>
+    1:1:void forEachRemovedCaller(com.android.tools.r8.ir.conversion.CallGraph$Node,java.util.function.Consumer):331:331 -> a
+    2:3:int numberOfRemovedEdges():336:337 -> a
 com.android.tools.r8.ir.conversion.CallGraphBuilder$InvokeExtractor -> com.android.tools.r8.D.c.i:
     com.android.tools.r8.ir.conversion.CallGraphBuilder this$0 -> d
     boolean $assertionsDisabled -> e
@@ -27233,26 +27329,28 @@
     1:1:void <clinit>():112:112 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.conversion.CallGraphBuilder,com.android.tools.r8.ir.conversion.CallGraph$Node):116:118 -> <init>
     1:3:void addClassInitializerTarget(com.android.tools.r8.graph.DexClass):122:124 -> a
-    4:6:void addTarget(com.android.tools.r8.graph.DexEncodedMethod,boolean):137:139 -> a
-    7:29:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):144:166 -> a
-    30:31:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):152:153 -> a
-    32:32:void lambda$processInvoke$0(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):153:153 -> a
-    33:36:java.util.Set lambda$processInvokeWithDynamicDispatch$1(boolean,com.android.tools.r8.graph.DexMethod):192:195 -> a
-    37:37:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):228:228 -> a
-    38:38:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):258:258 -> a
-    39:39:void registerCallSite(com.android.tools.r8.graph.DexCallSite):289:289 -> a
-    1:32:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):173:204 -> b
-    33:33:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):240:240 -> b
-    34:34:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):252:252 -> b
-    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):234:234 -> c
-    2:3:boolean registerNewInstance(com.android.tools.r8.graph.DexType):264:265 -> c
-    4:4:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):272:272 -> c
+    4:15:void addTarget(com.android.tools.r8.graph.DexEncodedMethod,boolean):137:148 -> a
+    16:38:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):152:174 -> a
+    39:40:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):160:161 -> a
+    41:41:void lambda$processInvoke$0(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):161:161 -> a
+    42:45:java.util.Set lambda$processInvokeWithDynamicDispatch$1(boolean,com.android.tools.r8.graph.DexMethod):200:203 -> a
+    46:46:java.util.Set com.android.tools.r8.graph.ResolutionResult.lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):33:33 -> a
+    46:46:java.util.Set lambda$processInvokeWithDynamicDispatch$1(boolean,com.android.tools.r8.graph.DexMethod):203 -> a
+    47:47:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):236:236 -> a
+    48:48:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):266:266 -> a
+    49:49:void registerCallSite(com.android.tools.r8.graph.DexCallSite):297:297 -> a
+    1:32:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):181:212 -> b
+    33:33:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):248:248 -> b
+    34:34:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):260:260 -> b
+    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):242:242 -> c
+    2:3:boolean registerNewInstance(com.android.tools.r8.graph.DexType):272:273 -> c
+    4:4:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):280:280 -> c
     boolean registerTypeReference(com.android.tools.r8.graph.DexType) -> d
-    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):246:246 -> d
-    2:2:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):278:278 -> d
+    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):254:254 -> d
+    2:2:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):286:286 -> d
     1:4:void addClassInitializerTarget(com.android.tools.r8.graph.DexType):129:132 -> e
-    5:8:void processFieldAccess(com.android.tools.r8.graph.DexField):212:215 -> e
-    9:9:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):222:222 -> e
+    5:8:void processFieldAccess(com.android.tools.r8.graph.DexField):220:223 -> e
+    9:9:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):230:230 -> e
 com.android.tools.r8.ir.conversion.CallSiteInformation -> com.android.tools.r8.D.c.m:
     1:1:void <init>():14:14 -> <init>
     boolean hasDoubleCallSite(com.android.tools.r8.graph.DexMethod) -> a
@@ -27310,7 +27408,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):959:959 -> a
+    35:35:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     35:35:void rewriteNots():234 -> a
     35:35:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
     36:38:void rewriteNots():235:237 -> a
@@ -27540,7 +27638,7 @@
     10:10:java.util.List com.android.tools.r8.graph.CfCode.getInstructions():131:131 -> a
     10:10:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):297 -> a
     11:13:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):297:299 -> a
-    14:14:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    14:14:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     14:14:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299 -> a
     15:16:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299:300 -> a
     17:43:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299:325 -> a
@@ -27902,10 +28000,10 @@
     109:109:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):587:587 -> a
     109:109:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):427 -> a
     110:123:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):429:442 -> a
-    124:124:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    124:124:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     124:124:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):443 -> a
     125:153:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):445:473 -> a
-    154:154:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):430:430 -> a
+    154:154:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):475:475 -> a
     154:154:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):474 -> a
     155:166:void rewriteIfs():490:501 -> a
     155:166:com.android.tools.r8.graph.DexCode build():184 -> a
@@ -27923,7 +28021,7 @@
     214:214:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
     214:214:com.android.tools.r8.graph.DexCode build():226 -> a
     215:225:com.android.tools.r8.graph.DexCode build():227:237 -> a
-    226:226:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():1327:1327 -> a
+    226:226:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():1329:1329 -> a
     226:226:com.android.tools.r8.graph.DexCode build():237 -> a
     227:245:com.android.tools.r8.graph.DexCode build():238:256 -> a
     246:246:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
@@ -28538,7 +28636,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():1478:1478 -> a
+    206:206:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
     206:206:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):574 -> a
     207:209:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):575:577 -> a
     210:210:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
@@ -28549,14 +28647,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():1478:1478 -> a
+    251:251:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
     251:251:void joinPredecessorsWithIdenticalPhis():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):499:510 -> a
+    268:279:void com.android.tools.r8.ir.code.BasicBlock.removePredecessorsByIndex(java.util.List):506:517 -> 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
@@ -28569,14 +28667,14 @@
     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):1013:1013 -> a
+    336:336:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder):1085:1085 -> a
     336:336:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):610 -> a
     337:345:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):611:619 -> a
     346:346:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     346:346:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):619 -> a
     347:347:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):619:619 -> a
     348:361:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):616:629 -> a
-    362:362:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1074:1074 -> a
+    362:362:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1076:1076 -> a
     362:362:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):629 -> a
     363:363:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630:630 -> a
     364:375:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):124:135 -> a
@@ -28630,7 +28728,7 @@
     428:428:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo):916 -> a
     429:432:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo):917:920 -> a
     433:437:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):958:962 -> a
-    438:438:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():575:575 -> a
+    438:438:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():579:579 -> a
     438:438:boolean isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):934 -> a
     438:438:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):963 -> a
     439:439:boolean isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):934:934 -> a
@@ -28678,7 +28776,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():330:330 -> a
+    556:556:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     556:556:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141 -> a
     556:556:void addConstString(int,com.android.tools.r8.graph.DexString):1149 -> a
     557:558:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1142:1143 -> a
@@ -28687,7 +28785,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():330:330 -> a
+    564:564:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     564:564:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141 -> a
     564:564:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1158 -> a
     565:566:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1142:1143 -> a
@@ -28844,7 +28942,7 @@
     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:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():579:579 -> a
     999:999:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1981 -> a
     1000:1010:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1982:1992 -> a
     1011:1015:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1990:1994 -> a
@@ -28957,7 +29055,7 @@
     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:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> b
     59:59:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531 -> b
     60:66:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531:1537 -> b
     67:70:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1664:1667 -> b
@@ -29320,15 +29418,16 @@
     1:1:com.android.tools.r8.ir.code.BasicBlock access$100(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):181:181 -> a
     1:1:int access$400(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):181:181 -> b
 com.android.tools.r8.ir.conversion.IRConverter -> com.android.tools.r8.D.c.Y:
+    java.util.List neverMergePrefixes -> Q
     com.android.tools.r8.graph.AppView appView -> a
-    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.info.OptimizationFeedback simpleOptimizationFeedback -> M
+    com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed delayedOptimizationFeedback -> M
     com.android.tools.r8.ir.optimize.ConstantCanonicalizer constantCanonicalizer -> v
-    boolean seenNeverMergePrefix -> R
+    boolean seenNotNeverMergePrefix -> R
     com.android.tools.r8.ir.optimize.Inliner inliner -> y
+    boolean $assertionsDisabled -> T
     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
@@ -29340,442 +29439,397 @@
     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.optimize.info.MethodOptimizationInfoCollector methodOptimizationInfoCollector -> L
     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.naming.IdentifierNameStringMarker identifierNameStringMarker -> z
+    com.android.tools.r8.graph.DexString highestSortingString -> O
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner classInliner -> q
     com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer covariantReturnTypeAnnotationTransformer -> B
-    java.util.List neverMergePrefixes -> P
+    java.util.List onWaveDoneActions -> P
     com.android.tools.r8.ir.optimize.MemberValuePropagation memberValuePropagation -> w
     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 seenNotNeverMergePrefix -> Q
-    boolean $assertionsDisabled -> S
     com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> k
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter interfaceMethodRewriter -> m
+    boolean seenNeverMergePrefix -> S
     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.info.OptimizationFeedback simpleOptimizationFeedback -> N
     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
-    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):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:void <clinit>():119:119 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):185:185 -> <init>
+    2:170:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):168:336 -> <init>
+    boolean lambda$materializeInstructionBeforeLongOperationsWorkaround$20(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
     1:1:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    1:1:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):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
+    1:1:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):685 -> a
+    2:2:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):685:685 -> a
+    3:3:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):681:681 -> a
+    4:4:java.lang.String lambda$new$0(java.lang.String):205:205 -> a
+    5:8:java.util.Set getDesugaredCallSites():340:343 -> a
+    9:16:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):444:451 -> a
+    17:18:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):384:385 -> a
+    17:18:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):453 -> a
+    19:21:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):391:393 -> a
+    19:21:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):454 -> a
+    22:22:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):455:455 -> a
+    23:24:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):415:416 -> a
+    23:24:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):455 -> a
+    25:26:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):424:425 -> a
+    25:26:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):456 -> a
+    27:28:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):431:432 -> a
+    27:28:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):457 -> a
+    29:30:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):437:438 -> a
+    29:30:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):458 -> a
+    31:32:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):901:902 -> a
+    31:32:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):459 -> a
+    33:36:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):461:464 -> a
+    37:43:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):468:474 -> a
+    44:45:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):499:500 -> a
+    44:45:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):475 -> a
     46:53:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithout(com.android.tools.r8.graph.DexType):102:109 -> a
-    46:53:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):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
+    46:53:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):501 -> a
+    46:53:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):475 -> a
+    54:54:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):501:501 -> a
+    54:54:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):475 -> a
+    55:59:void convertClasses(java.lang.Iterable,java.util.concurrent.ExecutorService):537:541 -> a
+    60:62:void lambda$convertMethods$4(boolean,com.android.tools.r8.graph.DexEncodedMethod):556:558 -> a
+    63:71:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):622:630 -> a
+    72:73:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):881:882 -> a
+    72:73:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):631 -> a
     74:74:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    74:74:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):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
+    74:74:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):882 -> a
+    74:74:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):631 -> a
+    75:76:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):405:406 -> a
+    75:76:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):632 -> a
+    77:85:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):641:649 -> a
     86:86:com.android.tools.r8.ir.conversion.CallGraphBuilder com.android.tools.r8.ir.conversion.CallGraph.builder(com.android.tools.r8.graph.AppView):156:156 -> a
     86:86:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):170 -> a
-    86:86:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):654 -> a
+    86:86:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):649 -> a
     87:88:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):170:171 -> a
-    87:88:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):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
+    87:88:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):649 -> a
+    89:140:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):650:701 -> a
+    141:141:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    141:141:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):701 -> a
+    142:142:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):702:702 -> a
+    143:144:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):399:400 -> a
+    143:144:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):703 -> a
+    145:148:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):707:710 -> a
+    149:151:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):391:393 -> a
+    149:151:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):711 -> a
+    152:153:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):713:714 -> a
+    154:155:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):415:416 -> a
+    154:155:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):714 -> a
+    156:156:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):716:716 -> a
+    157:158:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):424:425 -> a
+    157:158:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):717 -> a
+    159:160:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):431:432 -> a
+    159:160:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):718 -> a
+    161:163:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):719:721 -> a
+    164:165:void finalizeLambdaMerging(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):892:893 -> a
+    164:165:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):722 -> a
+    166:166:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):724:724 -> a
+    167:168:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):901:902 -> a
+    167:168:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):725 -> a
+    169:171:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):727:729 -> a
+    172:187:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):728:743 -> a
+    188:190:com.android.tools.r8.graph.DexType computeOutlineClassType():943:945 -> a
+    188:190:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):743 -> a
+    191:191:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    191:191:com.android.tools.r8.graph.DexType computeOutlineClassType():945 -> a
+    191:191:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):743 -> a
+    192:194:com.android.tools.r8.graph.DexType computeOutlineClassType():946:948 -> a
+    192:194:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):743 -> a
+    195:247:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):743:795 -> a
+    248:255:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):789:796 -> a
     256:256:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    256:256:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):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
+    256:256:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):649 -> a
+    257:257:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):660:660 -> a
+    258:258:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):656:656 -> a
+    259:260:void lambda$optimize$8(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):740:741 -> a
+    261:264:void waveStart(java.util.Collection):800:803 -> a
+    265:265:void addWaveDoneAction(com.android.tools.r8.utils.Action):814:814 -> a
+    266:266:boolean isInWave():824:824 -> a
+    266:266:void addWaveDoneAction(com.android.tools.r8.utils.Action):817 -> a
+    267:267:void addWaveDoneAction(com.android.tools.r8.utils.Action):820:820 -> a
+    268:268:void addWaveDoneAction(com.android.tools.r8.utils.Action):818:818 -> a
+    269:269:void addWaveDoneAction(com.android.tools.r8.utils.Action):815:815 -> a
+    270:270:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):828:828 -> a
+    271:276:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):838:843 -> a
+    277:294:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):842:859 -> a
+    295:305:java.lang.Object lambda$forEachSelectedOutliningMethod$13(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):845:855 -> a
+    306:306:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):864:864 -> a
     307:307:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    307:307:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):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
+    307:307:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):865 -> a
+    308:310:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):865:867 -> a
+    311:322:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):866:877 -> a
     323:323:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    323:323:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):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
+    323:323:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):865 -> a
+    324:324:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):911:911 -> a
+    325:328:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):955:958 -> a
+    329:334:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):964:969 -> a
+    335:340:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):973:978 -> a
     341:341:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    341:341:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):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
+    341:341:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):979 -> a
+    342:342:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):979:979 -> a
+    343:343:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):975:975 -> a
+    344:346:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):996:998 -> a
+    347:347:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):997:997 -> a
+    348:348:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1000:1000 -> a
     349:349:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    349:349:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):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
+    349:349:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1004 -> a
+    350:350:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1004:1004 -> a
+    351:351:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1000:1000 -> a
+    352:358:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1021:1027 -> a
+    359:361:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1069:1071 -> a
+    362:367:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1070:1075 -> a
+    368:368:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1012:1012 -> a
+    368:368:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1075 -> a
+    369:369:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1075:1075 -> a
+    370:383:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1074:1087 -> a
+    384:389:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1731:1736 -> a
+    384:389:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1090 -> a
+    390:396:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1091:1097 -> a
+    397:397:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1281:1281 -> a
+    397:397:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1097 -> a
+    398:412:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1098:1112 -> a
+    413:413:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():979:979 -> a
+    413:413:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1112 -> a
+    414:428:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1113:1127 -> a
+    429:429:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484:1484 -> a
+    429:429:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    430:430:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    430:430:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484 -> a
+    430:430:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    431:433:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484:1486 -> a
+    431:433:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    434:434:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    434:434:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1486 -> a
+    434:434:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    435:438:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1487:1490 -> a
+    435:438:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    439:453:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1136:1150 -> a
     454:454:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):90:90 -> a
-    454:454:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):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
+    454:454:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1151 -> a
+    455:500:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1152:1197 -> a
     501:501:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    501:501:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):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
+    501:501:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1197 -> a
+    502:555:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1202:1255 -> a
+    556:558:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):1032:1034 -> a
+    556:558:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1256 -> a
+    559:567:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1259:1267 -> a
+    568:586:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1266:1284 -> a
+    587:587:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():979:979 -> a
+    587:587:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1284 -> a
+    588:611:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1285:1308 -> a
+    612:630:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1300:1318 -> a
     631:631:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    631:631:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):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
+    631:631:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1301 -> a
+    632:681:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1321:1370 -> a
+    682:682:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    682:682:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1370 -> a
+    683:693:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1371:1381 -> a
+    694:699:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):891:896 -> a
+    694:699:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1381 -> a
+    700:743:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1382:1425 -> a
+    744:748:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):189:193 -> a
+    744:748:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1425 -> a
+    749:755:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.collectParameterUsages(int,com.android.tools.r8.ir.code.Value):205:211 -> a
+    749:755:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):196 -> a
+    749:755:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1425 -> a
+    756:759:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):198:201 -> a
+    756:759:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1425 -> a
+    760:776:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1426:1442 -> a
+    777:777:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):189:189 -> a
+    777:777:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1425 -> a
+    778:780:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1447:1449 -> a
+    781:781:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1289:1289 -> a
+    781:781:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1449 -> a
+    782:789:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1450:1457 -> a
+    790:790:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
+    790:790:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1460 -> a
+    791:796:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1460:1465 -> a
+    797:797:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
+    797:797:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1465 -> a
+    798:799:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1465:1466 -> a
+    800:805:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1465:1470 -> a
+    806:806:void lambda$rewriteCodeInternal$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1184:1184 -> a
+    807:807:com.android.tools.r8.ir.optimize.InliningOracle lambda$rewriteCodeInternal$17(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):1310:1310 -> a
+    808:809:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1474:1475 -> a
+    810:810:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    810:810:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1475 -> a
+    811:815:void finalizeToCf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1494:1498 -> a
+    811:815:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1476 -> a
+    816:816:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1478:1478 -> a
+    817:817:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1503:1503 -> a
+    817:817:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    818:823:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1542:1547 -> a
+    818:823:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    818:823:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    824:824:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1314:1314 -> a
+    824:824:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1547 -> a
+    824:824:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    824:824:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    825:825:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548:1548 -> a
+    825:825:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    825:825:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    826:838:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3680:3692 -> a
+    826:838:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> a
+    826:838:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    826:838:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    839:839:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
+    839:839:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3693 -> a
+    839:839:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> a
+    839:839:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    839:839:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    840:841:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3693:3694 -> a
+    840:841:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> a
+    840:841:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    840:841:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    842:842:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3680:3680 -> a
+    842:842:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> a
+    842:842:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    842:842:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    843:852:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1550:1559 -> a
+    843:852:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    843:852:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    853:853:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1558:1558 -> a
+    853:853:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    853:853:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    854:854:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1506:1506 -> a
+    854:854:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    855:859:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1530:1534 -> a
+    855:859:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1507 -> a
+    855:859:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    860:862:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1508:1510 -> a
+    860:862:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    863:863:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1012:1012 -> a
+    863:863:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1510 -> a
+    863:863:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    864:864:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1510:1510 -> a
+    864:864:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    865:869:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1509:1513 -> a
+    865:869:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    870:870:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1616:1616 -> a
+    871:871:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1265:1265 -> a
+    871:871:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1616 -> a
+    872:883:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1619:1630 -> a
+    884:886:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1676:1678 -> a
+    884:886:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1631 -> a
+    887:887:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1634:1634 -> a
+    888:889:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1683:1684 -> a
+    888:889:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1635 -> a
+    890:891:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1688:1689 -> a
+    890:891:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1638 -> a
+    892:893:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1641:1642 -> a
+    894:898:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1662:1666 -> a
+    894:898:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1643 -> a
+    899:904:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1644:1649 -> a
+    905:905:void ensureThrowingInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):1698:1698 -> a
+    905:905:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
+    906:906:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    906:906:void ensureThrowingInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):1698 -> a
+    906:906:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
+    907:909:void ensureThrowingInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):1699:1701 -> a
+    907:909:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
+    910:910:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.InstructionListIterator.split(com.android.tools.r8.ir.code.IRCode):99:99 -> a
+    910:910:void ensureThrowingInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):1703 -> a
+    910:910:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
+    911:916:void ensureThrowingInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):1704:1709 -> a
+    911:916:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
+    917:918:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$19(com.android.tools.r8.graph.DexItemFactory):1624:1625 -> a
+    919:919:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$19(com.android.tools.r8.graph.DexItemFactory):1623:1623 -> a
+    920:920:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1671:1671 -> a
+    921:921:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1747:1747 -> a
+    922:922:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
+    922:922:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1748 -> a
+    923:940:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1749:1766 -> a
+    1:6:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):480:485 -> b
+    7:18:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):483:494 -> b
+    19:28:void convertMethods(com.android.tools.r8.graph.DexProgramClass):545:554 -> b
+    29:57:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):564:592 -> b
     58:58:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
-    58:58:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):597 -> b
-    59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> b
+    58:58:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):592 -> b
+    59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> b
+    59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> b
     59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> b
-    59:59:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):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
+    59:59:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):592 -> b
+    60:64:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):592:596 -> b
+    65:65:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> b
+    65:65:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596 -> b
+    66:72:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596:602 -> b
+    73:73:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):599:599 -> b
     74:74:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> b
-    74:74:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):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):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):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):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):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
+    74:74:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):599 -> b
+    75:80:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):599:604 -> b
+    81:81:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> b
+    81:81:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):604 -> b
+    82:86:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1530:1534 -> b
+    82:86:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):605 -> b
+    87:89:void lambda$optimize$9(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):749:751 -> b
+    90:90:boolean isInWave():824:824 -> b
+    91:93:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):987:989 -> b
+    94:102:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1045:1053 -> b
+    103:103:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1051:1051 -> b
+    104:109:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1519:1524 -> b
+    110:114:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1522:1526 -> b
+    115:115:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1565:1565 -> b
+    116:116:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1302:1302 -> b
+    116:116:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1565 -> b
+    117:121:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1569:1573 -> b
+    122:122:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> b
+    122:122:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1574 -> b
+    123:134:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1574:1585 -> b
+    135:135:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1715:1715 -> b
+    135:135:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
+    136:136:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> b
+    136:136:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1715 -> b
+    136:136:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
+    137:139:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1716:1718 -> b
+    137:139:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
+    140:140:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> b
+    140:140:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1718 -> b
+    140:140:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
+    141:143:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1719:1721 -> b
+    141:143:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
     144:144:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):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):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
+    144:144:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1722 -> b
+    144:144:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
+    145:147:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1724:1726 -> b
+    145:147:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
+    148:148:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> b
+    148:148:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1727 -> b
+    148:148:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
+    149:153:boolean lambda$workaroundForwardingInitializerBug$18(com.android.tools.r8.ir.code.Instruction):1587:1591 -> b
+    154:155:void printPhase(java.lang.String):1741:1742 -> b
+    1:20:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):507:526 -> c
+    21:27:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):525:531 -> c
     28:41:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithAddedOrReplaced(com.android.tools.r8.graph.DexAnnotation):125:138 -> c
-    28:41:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):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
+    28:41:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):531 -> c
+    42:42:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):531:531 -> c
+    43:43:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):829:829 -> c
     44:44:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> c
-    44:44:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):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
+    44:44:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):830 -> c
+    45:45:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):830:830 -> c
+    46:46:void lambda$computeReachabilitySensitivity$11(com.android.tools.r8.graph.DexEncodedMethod):830:830 -> c
+    47:47:void clearDexMethodCompilationState():907:907 -> c
     boolean lambda$convertMethod$5(com.android.tools.r8.graph.DexEncodedMethod) -> d
-    1:7:boolean enableTryWithResourcesDesugaring():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
+    1:7:boolean enableTryWithResourcesDesugaring():366:372 -> d
+    8:8:void lambda$convertClasses$3(com.android.tools.r8.graph.DexProgramClass):539:539 -> d
+    1:1:boolean enableTwrCloseResourceDesugaring():362:362 -> e
+    2:2:com.android.tools.r8.graph.DexType lambda$updateMainDexListWithSynthesizedClassMap$1(com.android.tools.r8.graph.DexProgramClass):484:484 -> e
+    3:7:java.lang.Object lambda$forEachSynthesizedServiceLoaderMethod$14(com.android.tools.r8.graph.DexEncodedMethod):869:873 -> e
+    1:2:boolean removeLambdaDeserializationMethods():376:377 -> f
+    3:3:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$2(com.android.tools.r8.graph.DexProgramClass):523:523 -> f
+    4:4:void lambda$waveStart$10(com.android.tools.r8.graph.DexEncodedMethod):803:803 -> f
+    1:3:void waveDone():808:810 -> g
 com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.D.c.a0:
     java.util.Map protoFixupCache -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -29794,7 +29848,7 @@
     42:42:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     42:42:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):116 -> a
     43:58:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):117:132 -> a
-    59:59:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():977:977 -> a
+    59:59:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():979:979 -> a
     59:59:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):132 -> a
     60:63:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):133:136 -> a
     64:104:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):135:175 -> a
@@ -29916,12 +29970,12 @@
     boolean verifyRegister(int) -> f
     int instructionIndex(int) -> g
 com.android.tools.r8.ir.conversion.StringSwitchConverter -> com.android.tools.r8.D.c.l0:
-    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     1:1:boolean isDefinedByStringHashCode(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):184 -> a
     1:1:boolean access$700(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104 -> a
     2:7:boolean isDefinedByStringHashCode(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):185:190 -> a
     2:7:boolean access$700(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104 -> a
-    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     8:8:boolean isDefinedByStringHashCode(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):184 -> a
     8:8:boolean access$700(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104 -> a
 com.android.tools.r8.ir.conversion.StringSwitchConverter$1 -> com.android.tools.r8.D.c.d0:
@@ -29949,13 +30003,13 @@
     24:24:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping setFallthroughBlock(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):622:622 -> a
     24:24:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):658 -> a
     25:45:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):663:683 -> a
-    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     46:46:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):684 -> a
     47:62:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):685:700 -> a
     63:63:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):687:687 -> a
     64:64:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping setFallthroughBlock(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):622:622 -> a
     64:64:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):687 -> a
-    65:65:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    65:65:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     65:65:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):684 -> a
     66:66:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):675:675 -> a
     67:67:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping setFallthroughBlock(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):622:622 -> a
@@ -30009,7 +30063,7 @@
     2:4:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):360:362 -> a
     5:23:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.If):404:422 -> a
     5:23:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):362 -> a
-    24:24:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    24:24:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     24:24:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.If):423 -> a
     24:24:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):362 -> a
     25:35:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.If):424:434 -> a
@@ -30019,7 +30073,7 @@
     36:36:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):362 -> a
     37:45:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.If):441:449 -> a
     37:45:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):362 -> a
-    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     46:46:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.If):423 -> a
     46:46:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):362 -> a
     47:48:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):364:365 -> a
@@ -30034,7 +30088,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():1425:1427 -> b
+    28:30:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.startOfGotoChain():1461:1463 -> b
     28:30:com.android.tools.r8.ir.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
@@ -30060,10 +30114,10 @@
     1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.IdentifierNameStringMarker):43:47 -> <init>
     1:21:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):51:71 -> a
     22:45:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):80:103 -> a
-    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     46:46:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):104 -> a
     47:52:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):104:109 -> a
-    53:53:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    53:53:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     53:53:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):110 -> a
     54:75:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):111:132 -> a
     76:88:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):129:141 -> a
@@ -30202,7 +30256,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():879:879 -> a
+    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     2:2:void desugar(com.android.tools.r8.ir.code.IRCode):93 -> a
     3: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
@@ -30238,13 +30292,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():309:309 -> a
+    12:12:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     12:12:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1308 -> a
     13:13:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1309:1309 -> a
     14:14:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
     14:14:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):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):1220:1220 -> a
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     16:16:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1319 -> a
     17:17:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1320:1320 -> a
     18:18:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1326:1326 -> a
@@ -30295,12 +30349,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):1220:1220 -> c
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> c
     4:4:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):76 -> c
     4:4:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):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):1333:1333 -> c
+    8:8:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> c
     8:8:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):77 -> c
     8:8:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):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
@@ -30315,23 +30369,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):1333:1333 -> e
+    158:158:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> e
     158:158:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1055 -> e
     159:165:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1056:1062 -> e
-    166:166:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> e
+    166:166:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> e
     166:166:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1063 -> e
     167:167:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1064:1064 -> e
     1:12:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1082:1093 -> f
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f
     13:13:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1094 -> f
     14:28:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1094:1108 -> f
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f
     29:29:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1111 -> f
     30:30:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1111:1111 -> f
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f
     31:31:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1112 -> f
     32:32:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1112:1112 -> f
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f
     33:33:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1113 -> f
     34:49:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1113:1128 -> f
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.D.d.h:
@@ -30390,7 +30444,12 @@
     112:157:void process(com.android.tools.r8.graph.DexClass):96 -> a
     158:170:void process(com.android.tools.r8.graph.DexClass):97:109 -> a
     171:189:com.android.tools.r8.graph.DexEncodedMethod addForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):113:131 -> a
-    190:209:void hideCandidates(java.util.List,java.util.List,java.util.List):260:279 -> a
+    190:194:void hideCandidates(java.util.List,java.util.List,java.util.List):260:264 -> a
+    195:195:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    195:195:void hideCandidates(java.util.List,java.util.List,java.util.List):264 -> a
+    196:209:void hideCandidates(java.util.List,java.util.List,java.util.List):266:279 -> a
+    210:210:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    210:210:void hideCandidates(java.util.List,java.util.List,java.util.List):264 -> a
 com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.D.d.l:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.ir.conversion.IRConverter converter -> a
@@ -30494,9 +30553,20 @@
     java.util.Set hidden -> b
     1:5:void <init>():19:23 -> <init>
     1:2:void merge(com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection):62:63 -> a
-    3:8:void hideMatches(com.android.tools.r8.graph.DexMethod):67:72 -> a
-    9:9:void addDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):78:78 -> a
-    10:43:java.util.List createCandidatesList():83:116 -> a
+    3:5:void hideMatches(com.android.tools.r8.graph.DexMethod):67:69 -> a
+    6:6:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    6:6:void hideMatches(com.android.tools.r8.graph.DexMethod):70 -> a
+    7:8:void hideMatches(com.android.tools.r8.graph.DexMethod):71:72 -> a
+    9:9:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    9:9:void hideMatches(com.android.tools.r8.graph.DexMethod):70 -> a
+    10:10:void addDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):78:78 -> a
+    11:38:java.util.List createCandidatesList():83:110 -> a
+    39:39:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    39:39:java.util.List createCandidatesList():110 -> a
+    40:40:java.util.List createCandidatesList():112:112 -> a
+    41:41:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    41:41:java.util.List createCandidatesList():110 -> a
+    42:42:java.util.List createCandidatesList():116:116 -> a
     1:8:java.util.List createFullList():123:130 -> b
     1:3:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection wrapInCollection():136:138 -> c
 com.android.tools.r8.ir.desugar.DefaultMethodsHelper$1 -> com.android.tools.r8.D.d.n:
@@ -30516,89 +30586,111 @@
     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
+    1:1:void <clinit>():59:59 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):68:68 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView):66:71 -> <init>
+    1:1:void desugar(com.android.tools.r8.ir.code.IRCode):76:76 -> a
+    2:17:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):119:134 -> a
+    2:17:void desugar(com.android.tools.r8.ir.code.IRCode):80 -> a
+    18:36:void generateCallBack(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):173:191 -> a
+    18:36:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):134 -> a
+    18:36:void desugar(com.android.tools.r8.ir.code.IRCode):80 -> a
+    37:38:void addCallBackSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):196:197 -> a
+    37:38:void generateCallBack(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):192 -> a
+    37:38:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):134 -> a
+    37:38:void desugar(com.android.tools.r8.ir.code.IRCode):80 -> a
+    39:43:void desugar(com.android.tools.r8.ir.code.IRCode):82:86 -> a
+    44:44:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    44:44:void desugar(com.android.tools.r8.ir.code.IRCode):87 -> a
+    45:61:void desugar(com.android.tools.r8.ir.code.IRCode):88:104 -> a
+    62:73:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):262:273 -> a
+    62:73:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    74:75:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):390:391 -> a
+    74:75:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):276 -> a
+    74:75:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    76:76:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414:414 -> a
+    76:76:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):391 -> a
+    76:76:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):276 -> a
+    76:76:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    77:77:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    77:77:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414 -> a
+    77:77:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):391 -> a
+    77:77:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):276 -> a
+    77:77:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    78:78:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    78:78:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414 -> a
+    78:78:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):391 -> a
+    78:78:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):276 -> a
+    78:78:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    79:81:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):392:394 -> a
+    79:81:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):276 -> a
+    79:81:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    82:105:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):279:302 -> a
+    82:105:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    106:109:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):381:384 -> a
+    106:109:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):304 -> a
+    106:109:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    110:110:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414:414 -> a
+    110:110:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):384 -> a
+    110:110:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):304 -> a
+    110:110:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    111:111:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    111:111:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414 -> a
+    111:111:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):384 -> a
+    111:111:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):304 -> a
+    111:111:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    112:112:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    112:112:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414 -> a
+    112:112:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):384 -> a
+    112:112:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):304 -> a
+    112:112:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    113:113:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):385:385 -> a
+    113:113:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):304 -> a
+    113:113:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    114:135:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):303:324 -> a
+    114:135:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    136:136:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):66:66 -> a
+    136:136:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):320 -> a
+    136:136:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    137:138:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):326:327 -> a
+    137:138:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    139:139:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):326:326 -> a
+    139:139:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    140:140:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    140:140:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):330 -> a
+    140:140:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    141:142:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):331:332 -> a
+    141:142:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    143:143:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    143:143:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):333 -> a
+    143:143:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    144:144:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):335:335 -> a
+    144:144:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    145:145:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    145:145:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):336 -> a
+    145:145:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    146:148:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):337:339 -> a
+    146:148:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    149:149:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    149:149:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):340 -> a
+    149:149:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    150:151:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):345:346 -> a
+    150:151:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    152:175:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):140:163 -> a
+    176:190:com.android.tools.r8.graph.DexMethod methodWithVivifiedTypeInSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):202:216 -> a
+    191:195:void generateWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):222:226 -> a
+    196:200:void warnInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.lang.String):231:235 -> a
+    201:201:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):251:251 -> a
+    202:202:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    202:202:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):252 -> a
+    203:203:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):252:252 -> a
+    204:204:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    204:204:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):252 -> a
+    205:205:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):253:253 -> a
+    206:223:void splitIfCatchHandlers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):355:372 -> a
+    224:234:com.android.tools.r8.graph.DexMethod createConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):400:410 -> a
+    235:235:com.android.tools.r8.graph.DexMethod createConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):409:409 -> a
+    236:237:boolean canConvert(com.android.tools.r8.graph.DexType):418:419 -> a
 com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration -> com.android.tools.r8.D.d.s:
     java.util.Map rewritePrefix -> b
     java.util.Map emulateLibraryInterface -> c
@@ -30639,12 +30731,12 @@
     7:7:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder addDontRewriteInvocation(java.lang.String):181:181 -> a
     8:8:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> a
     8:8:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):173 -> a
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     9:9:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> a
     9:9:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):173 -> a
     10:10:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> a
     10:10:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):174 -> a
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     11:11:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> a
     11:11:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):174 -> a
     12:12:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):175:175 -> a
@@ -30652,34 +30744,34 @@
     1:1:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder setLibraryCompilation():136:136 -> b
     2:2:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> b
     2:2:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):154 -> b
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
     3:3:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> b
     3:3:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):154 -> b
     4:4:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> b
     4:4:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):155 -> b
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
     5:5:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> b
     5:5:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):155 -> b
     6:6:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):156:156 -> b
     7:7:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> b
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
     8:8:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> b
     1:1:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder setProgramCompilation():131:131 -> c
     2:2:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> c
     2:2:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):147 -> c
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> c
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> c
     3:3:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> c
     3:3:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):147 -> c
     4:4:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> c
     4:4:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):148 -> c
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> c
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> c
     5:5:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> c
     5:5:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):148 -> c
     6:6:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):149:149 -> c
     1:5:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):161:165 -> d
     6:6:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> d
     6:6:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):166 -> d
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> d
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> d
     7:7:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> d
     7:7:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):166 -> d
     8:9:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):167:168 -> d
@@ -30742,80 +30834,98 @@
     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
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter):116:116 -> <init>
+    2:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter):103:119 -> <init>
+    1:5:boolean canGenerateWrapper(com.android.tools.r8.graph.DexType):135:139 -> 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):170:170 -> 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
+    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):170 -> a
+    8:34:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):170:196 -> a
+    35:36:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):187:188 -> a
+    37:39:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
+    37:39:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):190 -> a
+    40:40:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):198:198 -> a
+    41:41: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):176:176 -> a
+    42:42:com.android.tools.r8.graph.DexType createWrapperType(com.android.tools.r8.graph.DexType,java.lang.String):155:155 -> a
+    42: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):177 -> a
+    43:43:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    43:43:com.android.tools.r8.graph.DexType createWrapperType(com.android.tools.r8.graph.DexType,java.lang.String):157 -> a
+    43:43:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):177 -> a
+    44:44:com.android.tools.r8.graph.DexType createWrapperType(com.android.tools.r8.graph.DexType,java.lang.String):157:157 -> a
+    44:44:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):177 -> a
+    45:45:com.android.tools.r8.graph.DexType createWrapperType(com.android.tools.r8.graph.DexType,java.lang.String):156:156 -> a
+    45:45:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):177 -> a
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    46:46:com.android.tools.r8.graph.DexType createWrapperType(com.android.tools.r8.graph.DexType,java.lang.String):155 -> a
+    46:46:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):177 -> a
+    47:48:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):178:179 -> a
+    49:49:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):206:206 -> a
+    50:54:com.android.tools.r8.graph.DexEncodedField synthesizeWrappedValueField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):434:438 -> a
+    50:54:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):207 -> a
+    55:55:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):202:202 -> a
+    55:55:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):209 -> a
+    56:56:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):211:211 -> a
+    57:93:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):306:342 -> a
+    57:93:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):211 -> a
+    94:99:com.android.tools.r8.graph.DexEncodedMethod[] finalizeWrapperMethods(java.util.List,java.util.Set):349:354 -> a
+    94:99:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):344 -> a
+    94:99:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):211 -> a
+    100:100:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):208:208 -> a
+    101:118: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):232:249 -> a
+    119:122:com.android.tools.r8.graph.DexEncodedMethod synthesizeConstructor(com.android.tools.r8.graph.DexField):442:445 -> a
+    119:122: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):253 -> a
+    123:131:com.android.tools.r8.graph.DexEncodedMethod synthesizeConstructor(com.android.tools.r8.graph.DexField):443:451 -> a
+    123:131: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):253 -> a
+    132:137:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):456:461 -> a
+    132:137:com.android.tools.r8.graph.DexEncodedMethod synthesizeConstructor(com.android.tools.r8.graph.DexField):447 -> a
+    132:137: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):253 -> a
+    138:142: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):253:257 -> a
+    143:143:java.lang.String lambda$reportFinalMethodsInWrapper$1(com.android.tools.r8.graph.DexMethod):359:359 -> a
+    144:144:java.lang.String[] lambda$reportFinalMethodsInWrapper$2(int):359:359 -> a
+    145:154:void reportFinalMethodsInWrapper(java.util.Set):359:368 -> a
+    155:155:void reportFinalMethodsInWrapper(java.util.Set):363:363 -> a
+    156:164: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):374:382 -> a
+    165:202:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexLibraryClass):387:424 -> a
+    203:205:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):473:475 -> a
+    206:206: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):490:490 -> a
+    207:211:boolean verifyAllClassesGenerated():501:505 -> a
+    207:211: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):490 -> a
+    212: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):491:494 -> a
+    216:217:void registerSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexApplication$Builder):512:513 -> a
+    216: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):495 -> a
+    218:218: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):496:496 -> a
+    219:221:void generateTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):517:519 -> a
+    222:222:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):202:202 -> a
+    222:222:void generateTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):524 -> a
+    223:223:void generateTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):525:525 -> a
+    224:224:void generateTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):520:520 -> a
+    225:225:void generateTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):519:519 -> a
+    226:228: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):545:547 -> a
+    229:253: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):546:570 -> a
+    254:259:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):456:461 -> a
+    254: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):572 -> a
+    1:1:com.android.tools.r8.graph.DexType getTypeWrapper(com.android.tools.r8.graph.DexType):143:143 -> b
+    2:2:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):217:217 -> b
+    3:3:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):202:202 -> b
+    3:3:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):219 -> b
+    4:8:com.android.tools.r8.graph.DexEncodedField synthesizeWrappedValueField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):434:438 -> b
+    4:8:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):219 -> b
+    9:9:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):223:223 -> b
+    10:47:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):262:299 -> b
+    10:47:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):223 -> b
+    48:53:com.android.tools.r8.graph.DexEncodedMethod[] finalizeWrapperMethods(java.util.List,java.util.Set):349:354 -> b
+    48:53:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):301 -> b
+    48:53:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):223 -> b
+    54:54:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):220:220 -> b
+    55:56:void generateVivifiedTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):529:530 -> b
+    57:57:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):202:202 -> b
+    57:57:void generateVivifiedTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):534 -> b
+    58:58:void generateVivifiedTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):536:536 -> b
+    59:59:void generateVivifiedTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):531:531 -> b
+    60:60:void generateVivifiedTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):530:530 -> b
+    1:1:com.android.tools.r8.graph.DexType getVivifiedTypeWrapper(com.android.tools.r8.graph.DexType):147:147 -> c
+    1:1:boolean hasSynthesized(com.android.tools.r8.graph.DexType):127:127 -> d
+    1:1:boolean isSynthesizedWrapper(com.android.tools.r8.graph.DexType):123:123 -> e
 com.android.tools.r8.ir.desugar.InterfaceMethodRewriter -> com.android.tools.r8.D.d.w:
     java.util.concurrent.ConcurrentHashMap nearestEmulatedInterfaceCache -> g
     java.util.Set synthesizedMethods -> h
@@ -30836,10 +30946,10 @@
     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:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     16:16:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):161 -> a
     17:24:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):159:166 -> a
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     25:25:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):165 -> a
     26:26:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):163:163 -> a
     27:36:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):177:186 -> a
@@ -30898,7 +31008,7 @@
     220:220:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
     220:220:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):314 -> a
     221:269:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):314:362 -> a
-    270:270:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    270:270:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     270:270:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):362 -> a
     271:283:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):362:374 -> a
     284:284:java.util.Set lambda$rewriteMethodReferences$0(com.android.tools.r8.graph.DexLibraryClass):236:236 -> a
@@ -30932,10 +31042,10 @@
     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 com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     388:388:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):779 -> a
     389:393:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):788:792 -> a
-    394:394:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    394:394:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     394:394:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):792 -> a
     395:404:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):837:846 -> a
     405:405:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):843:843 -> a
@@ -30945,105 +31055,105 @@
     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:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     413:413:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):964 -> a
     414:417:java.util.Map processEmulatedInterfaceHierarchy():575:578 -> a
     414:417:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):556 -> a
     414:417:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     418:425:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):557:564 -> a
     418:425:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    426:426:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):636:636 -> a
+    426:426:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):636:636 -> a
     426:426:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     426:426:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     427:427:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    427:427:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):637 -> a
+    427:427:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):637 -> a
     427:427:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     427:427:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    428:432:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):637:641 -> a
+    428:432:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):637:641 -> a
     428:432:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     428:432:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    433:439:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):640:646 -> a
+    433:439:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):640:646 -> a
     433:439:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     433:439:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     440:440:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
-    440:440:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648 -> a
+    440:440:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648 -> a
     440:440:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     440:440:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    441:441:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648:648 -> a
+    441:441:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648:648 -> a
     441:441:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     441:441:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    442:461:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):647:666 -> a
+    442:461:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):647:666 -> a
     442:461:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     442:461:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     462:470:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):612:620 -> a
-    462:470:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666 -> a
+    462:470:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666 -> a
     462:470:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     462:470:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    471:475:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:671 -> a
+    471:475:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:671 -> a
     471:475:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     471:475:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    476:478:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):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:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1264:1266 -> a
+    476:478:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672 -> a
     476:478:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     476:478:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    479:479:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672:672 -> a
+    479:479:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672:672 -> a
     479:479:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     479:479:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    480:480:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):670:670 -> a
+    480:480:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):670:670 -> a
     480:480:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     480:480:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    481:481:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:667 -> a
+    481:481:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:667 -> a
     481:481:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     481:481:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    482:482:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):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:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1264:1264 -> a
+    482:482:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672 -> a
     482:482:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     482:482:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    483:489:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):680:686 -> a
+    483:489:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):680:686 -> a
     483:489:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     483:489:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     490:490:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
-    490:490:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690 -> a
+    490:490:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690 -> a
     490:490:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     490:490:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    491:491:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690:690 -> a
+    491:491:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690:690 -> a
     491:491:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     491:491:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    492: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:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1264:1266 -> a
+    492:494:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691 -> a
     492:494:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     492:494:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    495:495:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691:691 -> a
+    495:495:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691:691 -> a
     495:495:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     495:495:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    496:496:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):689:689 -> a
+    496:496:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):689:689 -> a
     496:496:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     496:496:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    497:497:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):686:686 -> a
+    497:497:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):686:686 -> a
     497:497:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     497:497:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    498:498:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):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:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1264:1264 -> a
+    498:498:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691 -> a
     498:498:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     498:498:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    499:499:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:697 -> a
+    499:499:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:697 -> a
     499:499:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     499:499:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     500: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:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699 -> a
     500:502:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     500:502:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     503:503:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):628:628 -> a
-    503:503:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699 -> a
+    503:503:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699 -> a
     503:503:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     503:503:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    504:504:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699:699 -> a
+    504:504:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699:699 -> a
     504:504:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     504:504:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    505:505:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):698:698 -> a
+    505:505:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):698:698 -> a
     505:505:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     505:505:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    506:547:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:738 -> a
+    506:547:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:738 -> a
     506:547:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     506:547:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     548:548:boolean isInMainDexList(com.android.tools.r8.graph.DexType):815:815 -> a
@@ -31052,7 +31162,7 @@
     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):637 -> a
+    551:551:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):637 -> a
     551:551:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     551:551:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     552:560:void duplicateEmulatedInterfaces():936:944 -> a
@@ -31094,7 +31204,7 @@
     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:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     615:615:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):986 -> a
     616:617:void renameEmulatedInterfaces():881:882 -> a
     616:617:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
@@ -31114,7 +31224,7 @@
     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 com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     632:632:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):916 -> a
     632:632:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
     632:632:void renameEmulatedInterfaces():883 -> a
@@ -31175,13 +31285,13 @@
     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 com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> b
     3:3:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528 -> b
     4:8:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528:532 -> b
     9:10:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):748:749 -> b
     11:11:java.lang.String getEmulateLibraryInterfaceClassDescriptor(java.lang.String):742:742 -> b
     11:11:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):750 -> b
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
     12:12:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):751 -> b
     13:13:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875:875 -> b
     14:14:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):871:871 -> b
@@ -31191,7 +31301,7 @@
     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 com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> c
     8:8:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):811 -> c
     9:9:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> c
     10:10:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> c
@@ -31297,7 +31407,7 @@
     2:40:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):65:103 -> <init>
     41:47:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):101:107 -> <init>
     1:21:com.android.tools.r8.graph.DexType createLambdaClassType(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):113:133 -> a
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     22:22:com.android.tools.r8.graph.DexType createLambdaClassType(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):133 -> a
     23:23:com.android.tools.r8.graph.DexProgramClass getOrCreateLambdaClass():137:137 -> a
     24:25:com.android.tools.r8.graph.DexField getCaptureField(int):184:185 -> a
@@ -31367,14 +31477,20 @@
 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
+    1:6:boolean ensureAccessibility():632:637 -> a
+    7:7:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    7:7:boolean ensureAccessibility():638 -> a
+    8:22:boolean ensureAccessibility():641:655 -> a
 com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.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
+    1:6:boolean ensureAccessibility():584:589 -> a
+    7:7:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    7:7:boolean ensureAccessibility():590 -> a
+    8:25:boolean ensureAccessibility():593:610 -> a
+    26:33:boolean ensureAccessibility():609:616 -> a
 com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.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
@@ -31474,7 +31590,7 @@
     14:46:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):82:114 -> a
     47:47:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57:57 -> a
     47:47:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):121 -> a
-    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):434:434 -> a
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):435:435 -> a
     48:48:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57 -> a
     48:48:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):121 -> a
     49:58:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):122:131 -> a
@@ -31484,12 +31600,12 @@
     62:62:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):229:229 -> a
     63:63:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():513:513 -> a
     63:63:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
-    64:64:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    64:64:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     64:64:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():513 -> a
     64:64:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
     65:65:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():522:522 -> a
     65:65:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
-    66:66:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    66:66:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     66:66:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():522 -> a
     66:66:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
     67:77:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():522:532 -> a
@@ -31501,7 +31617,7 @@
     95:112:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):289:306 -> a
     113:113:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57:57 -> a
     113:113:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
-    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):434:434 -> a
+    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):435:435 -> a
     114:114:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57 -> a
     114:114:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
     115:156:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):310:351 -> a
@@ -31570,100 +31686,111 @@
     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
+    28:38:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):152:162 -> a
+    39:40:com.android.tools.r8.ir.desugar.LambdaClass getKnownLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):333:334 -> a
+    39:40:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):163 -> a
+    41:42:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):164:165 -> a
+    43:54:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):377:388 -> a
+    43:54:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    55:55:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    55:55:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):388 -> a
+    55:55:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    56:56:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    56:56:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):387 -> a
+    56:56:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    57:90:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):390:423 -> a
+    57:90:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    91:91:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):40:40 -> a
+    91:91:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):423 -> a
+    91:91:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    92:92:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    92:92:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):425 -> a
+    92:92:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    93:96:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):426:429 -> a
+    93:96:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    97:97:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    97:97:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):435 -> a
+    97:97:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    98:112:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):436:450 -> a
+    98:112:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    113:114:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getCreateInstanceMethod():141:142 -> a
+    113:114:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):452 -> a
+    113:114:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    115:116:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):452:453 -> a
+    115:116:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    117:118:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):174:175 -> a
+    119:119:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    119:119:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):175 -> a
+    120:122:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):175:177 -> a
+    123:130:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):185:192 -> a
+    131:141:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):465:475 -> a
+    131:141:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    142:142:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    142:142:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):475 -> a
+    142:142:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    143:143:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    143:143:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):474 -> a
+    143:143:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    144:161:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):480:497 -> a
+    144:161:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    162:163:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getCreateInstanceMethod():141:142 -> a
+    162:163:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):499 -> a
+    162:163:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    164:165:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):499:500 -> a
+    164:165:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    166:168:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):200:202 -> a
+    169:169:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):201:201 -> a
+    170:178:boolean removeLambdaDeserializationMethods(java.lang.Iterable):210:218 -> a
+    179:179:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):194:194 -> a
+    179:179:boolean removeLambdaDeserializationMethods(java.lang.Iterable):218 -> a
+    180:182:boolean removeLambdaDeserializationMethods(java.lang.Iterable):219:221 -> a
+    183:189:void adjustAccessibility():237:243 -> a
+    190:190:void adjustAccessibility():242:242 -> a
+    191:192:com.android.tools.r8.graph.DexProgramClass getLambdaClass(com.android.tools.r8.graph.DexType):252:253 -> a
+    193:202:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):259:268 -> a
+    203:203:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):265:265 -> a
+    204:208:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):287:291 -> a
+    209:215:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):358:364 -> a
+    209:215:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):290 -> a
+    216:216:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):290:290 -> a
+    217:217:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):365:365 -> a
+    217:217:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):290 -> a
+    218:222:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):301:305 -> a
+    223:229:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):358:364 -> a
+    223:229:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306 -> a
+    230:234:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306:310 -> a
+    235:235:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
+    235:235:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):310 -> a
+    236:243:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):311:318 -> a
+    244:244:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    244:244:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):338 -> a
+    244:244:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    245:245:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    245:245:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):339 -> a
+    245:245:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    246:246:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):340:340 -> a
+    246:246:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    247:247:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    247:247:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):341 -> a
+    247:247:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    248:254:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):342:348 -> a
+    248:254:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    255:255:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):347:347 -> a
+    255:255:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    256:256:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    256:256:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):346 -> a
+    256:256:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    257:257:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):344:344 -> a
+    257:257:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    258:258:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):365:365 -> a
+    258:258:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306 -> a
+    259:259:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):325:325 -> a
+    260:260:boolean isInMainDexList(com.android.tools.r8.graph.DexType):295:295 -> a
+    260:260:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):326 -> a
+    261:261:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):327:327 -> a
+    262:264:java.lang.Object getKnown(java.util.Map,java.lang.Object):352:354 -> a
     1:1:boolean hasLambdaClassPrefix(com.android.tools.r8.graph.DexType):91:91 -> b
-    2:4:java.util.Set getDesugaredCallSites():269:271 -> b
+    2:4:java.util.Set getDesugaredCallSites():273:275 -> b
 com.android.tools.r8.ir.desugar.LambdaRewriter$1 -> com.android.tools.r8.D.d.L:
     com.android.tools.r8.ir.conversion.LensCodeRewriter val$lensCodeRewriter -> c
     com.android.tools.r8.ir.desugar.LambdaRewriter this$0 -> e
@@ -31693,7 +31820,7 @@
     1:1:com.android.tools.r8.graph.DexType getNestConstructorType():71:71 -> a
     2:2:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):79:79 -> a
     3:3:java.util.concurrent.Future asyncProcessNest(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService):112:112 -> a
-    4:6:void synthetizeNestConstructor(com.android.tools.r8.graph.DexApplication$Builder):171:173 -> a
+    4:6:void synthesizeNestConstructor(com.android.tools.r8.graph.DexApplication$Builder):171:173 -> a
     7:14:boolean invokeRequiresRewriting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):244:251 -> a
     15:22:boolean fieldAccessRequiresRewriting(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):255:262 -> a
     23:24:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):282:283 -> a
@@ -31709,33 +31836,33 @@
     61:66:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):301:306 -> a
     67:68:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):219:220 -> a
     67:68:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    69:69:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1275:1275 -> a
+    69:69:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1278:1278 -> a
     69:69:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     69:69:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     70:70:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    70:70:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1275 -> a
+    70:70:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1278 -> a
     70:70:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     70:70:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    71:71:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1275:1275 -> a
+    71:71:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1278:1278 -> a
     71:71:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     71:71:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     72:72:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    72:72:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1277 -> a
+    72:72:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1280 -> a
     72:72:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     72:72:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    73:76:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1276:1279 -> a
+    73:76:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1279:1282 -> a
     73:76:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     73:76:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     77:77:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):221:221 -> a
     77:77:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    78:78:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1275:1275 -> a
+    78:78:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1278:1278 -> a
     78:78:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     78:78:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     79:86:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):308:315 -> a
     87:89:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureInvokeBridge$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):318:320 -> a
     1:14:java.util.List extractNest(com.android.tools.r8.graph.DexClass):94:107 -> b
     15:16:com.android.tools.r8.graph.DexProgramClass createNestAccessConstructor():148:149 -> b
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
     17:17:com.android.tools.r8.graph.DexProgramClass createNestAccessConstructor():149 -> b
     18:36:com.android.tools.r8.graph.DexProgramClass createNestAccessConstructor():149:167 -> b
     37:37:void com.android.tools.r8.graph.DexProgramClass.<init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):70:70 -> b
@@ -31892,8 +32019,8 @@
     2:4:void <init>(com.android.tools.r8.graph.AppView):34:36 -> <init>
     boolean shouldProcessClassInNest(com.android.tools.r8.graph.DexClass,java.util.List) -> a
     1:1:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:44 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1048 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1050 -> a
     2:2:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44 -> a
     3:4:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:45 -> a
     5:5:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:44 -> a
@@ -32010,7 +32137,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):959:959 -> a
+    13:13:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     13:13:void desugar():343 -> a
     14:14:void desugar():344:344 -> a
     15:16:void appendInstruction(com.android.tools.r8.ir.code.Instruction):308:309 -> a
@@ -32026,7 +32153,7 @@
     26:26:void com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk.addAppendCall(com.android.tools.r8.ir.code.Value):413:413 -> a
     26:26:void desugar():352 -> a
     27:36:void desugar():356:365 -> a
-    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     37:37:void desugar():365 -> a
     38:39:void desugar():369:370 -> a
     40:70:void desugar():369:399 -> a
@@ -32045,7 +32172,7 @@
     java.lang.String str -> c
     1:3:void <init>(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder,java.lang.String,com.android.tools.r8.graph.DexMethod):436:438 -> <init>
     1:2:com.android.tools.r8.ir.code.Value getOrCreateValue():443:444 -> a
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     3:3:com.android.tools.r8.ir.code.Value getOrCreateValue():444 -> a
     4:8:com.android.tools.r8.ir.code.Value getOrCreateValue():445:449 -> a
     9:9:com.android.tools.r8.ir.code.Value getOrCreateValue():445:445 -> a
@@ -32077,34 +32204,34 @@
     14:19:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):122:127 -> a
     20:38:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):237:255 -> a
     20:38:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     39:39:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):262 -> a
     39:39:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     40:40:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):262:262 -> a
     40:40:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     41:41:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):266 -> a
     41:41:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     42:42:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):266:266 -> a
     42:42:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     43:43:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):270 -> a
     43:43:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     44:44:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):270:270 -> a
     44:44:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     45:45:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):271 -> a
     45:45:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     46:47:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):271:272 -> a
     46:47:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     48:48:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):269:269 -> a
     48:48:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     49:49:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):280 -> a
     49:49:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     50:50:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):280:280 -> a
     50:50:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     51:51:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):282 -> a
     51:51:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     52:52:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):282:282 -> a
@@ -32113,27 +32240,27 @@
     53:55:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     56:62:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):279:285 -> a
     56:62:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     63:63:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):287 -> a
     63:63:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     64:64:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):287:287 -> a
     64:64:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     65:65:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):291 -> a
     65:65:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     66:66:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):291:291 -> a
     66:66:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    67:67:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    67:67:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     67:67:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):293 -> a
     67:67:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     68:68:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):293:293 -> a
     68:68:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     69:69:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):294 -> a
     69:69:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     70:70:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):294:294 -> a
     70:70:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     71:71:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):295 -> a
     71:71:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     72:72:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):295:295 -> a
@@ -32142,27 +32269,27 @@
     73:77:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     78:78:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):290:290 -> a
     78:78:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     79:79:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):303 -> a
     79:79:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     80:80:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):303:303 -> a
     80:80:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     81:81:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):307 -> a
     81:81:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     82:82:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):307:307 -> a
     82:82:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     83:83:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):309 -> a
     83:83:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     84:84:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):309:309 -> a
     84:84:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    85:85:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    85:85:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     85:85:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):310 -> a
     85:85:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     86:86:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):310:310 -> a
     86:86:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    87:87:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    87:87:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     87:87:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):311 -> a
     87:87:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     88:88:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):311:311 -> a
@@ -32171,34 +32298,34 @@
     89:93:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     94:94:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):306:306 -> a
     94:94:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     95:95:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):320 -> a
     95:95:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     96:96:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):320:320 -> a
     96:96:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     97:97:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):322 -> a
     97:97:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     98:98:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):322:322 -> a
     98:98:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    99:99:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    99:99:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     99:99:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):327 -> a
     99:99:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     100:100:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):327:327 -> a
     100:100:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     101:101:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):328 -> a
     101:101:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     102:103:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):328:329 -> a
     102:103:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     104:104:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):326:326 -> a
     104:104:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    105:105:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    105:105:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     105:105:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):335 -> a
     105:105:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     106:106:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):335:335 -> a
     106:106:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    107:107:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    107:107:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     107:107:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):337 -> a
     107:107:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     108:108:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):337:337 -> a
@@ -32207,17 +32334,17 @@
     109:111:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     112:112:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):334:334 -> a
     112:112:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     113:113:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):343 -> a
     113:113:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     114:114:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):343:343 -> a
     114:114:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    115:115:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    115:115:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     115:115:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):345 -> a
     115:115:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     116:116:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):345:345 -> a
     116:116:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    117:117:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    117:117:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     117:117:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):346 -> a
     117:117:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     118:118:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):346:346 -> a
@@ -32226,17 +32353,17 @@
     119:122:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     123:130:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):342:349 -> a
     123:130:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    131:131:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    131:131:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     131:131:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):353 -> a
     131:131:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     132:132:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):353:353 -> a
     132:132:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    133:133:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    133:133:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     133:133:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):355 -> a
     133:133:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     134:134:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):355:355 -> a
     134:134:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    135:135:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    135:135:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     135:135:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):356 -> a
     135:135:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     136:136:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):356:356 -> a
@@ -32245,12 +32372,12 @@
     137:140:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     141:141:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):352:352 -> a
     141:141:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     142:142:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):362 -> a
     142:142:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     143:143:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):362:362 -> a
     143:143:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    144:144:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    144:144:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     144:144:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):364 -> a
     144:144:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     145:145:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):364:364 -> a
@@ -32259,22 +32386,22 @@
     146:148:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     149:149:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):361:361 -> a
     149:149:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    150:150:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    150:150:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     150:150:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):371 -> a
     150:150:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     151:151:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):371:371 -> a
     151:151:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    152:152:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    152:152:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     152:152:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):373 -> a
     152:152:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     153:153:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):373:373 -> a
     153:153:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    154:154:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    154:154:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     154:154:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):374 -> a
     154:154:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     155:155:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):374:374 -> a
     155:155:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    156:156:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    156:156:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     156:156:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):375 -> a
     156:156:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     157:157:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):375:375 -> a
@@ -32283,39 +32410,39 @@
     158:162:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     163:163:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):370:370 -> a
     163:163:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     164:164:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):382 -> a
     164:164:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     165:165:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):382:382 -> a
     165:165:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    166:166:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    166:166:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     166:166:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):384 -> a
     166:166:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     167:167:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):384:384 -> a
     167:167:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    168:168:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    168:168:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     168:168:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):389 -> a
     168:168:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     169:169:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):389:389 -> a
     169:169:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    170:170:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    170:170:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     170:170:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):390 -> a
     170:170:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     171:172:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):390:391 -> a
     171:172:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     173:178:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):388:393 -> a
     173:178:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    179:179:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    179:179:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     179:179:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):397 -> a
     179:179:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     180:180:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):397:397 -> a
     180:180:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    181:181:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    181:181:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     181:181:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):399 -> a
     181:181:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     182:182:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):399:399 -> a
     182:182:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    183:183:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    183:183:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     183:183:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):400 -> a
     183:183:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     184:184:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):400:400 -> a
@@ -32324,12 +32451,12 @@
     185:188:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     189:189:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):396:396 -> a
     189:189:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    190:190:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    190:190:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     190:190:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):407 -> a
     190:190:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     191:191:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):407:407 -> a
     191:191:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    192:192:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    192:192:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     192:192:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):409 -> a
     192:192:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     193:193:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):409:409 -> a
@@ -32338,17 +32465,17 @@
     194:196:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     197:197:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):406:406 -> a
     197:197:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    198:198:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    198:198:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     198:198:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):415 -> a
     198:198:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     199:199:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):415:415 -> a
     199:199:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    200:200:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    200:200:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     200:200:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):417 -> a
     200:200:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     201:201:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):417:417 -> a
     201:201:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    202:202:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    202:202:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     202:202:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):418 -> a
     202:202:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     203:203:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):418:418 -> a
@@ -32357,12 +32484,12 @@
     204:207:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     208:208:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):414:414 -> a
     208:208:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    209:209:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    209:209:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     209:209:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):424 -> a
     209:209:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     210:210:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):424:424 -> a
     210:210:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    211:211:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    211:211:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     211:211:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):426 -> a
     211:211:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     212:212:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):426:426 -> a
@@ -32371,22 +32498,22 @@
     213:215:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     216:216:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):423:423 -> a
     216:216:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    217:217:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    217:217:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     217:217:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):433 -> a
     217:217:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     218:218:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):433:433 -> a
     218:218:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    219:219:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    219:219:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     219:219:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):435 -> a
     219:219:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     220:220:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):435:435 -> a
     220:220:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    221:221:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    221:221:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     221:221:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):436 -> a
     221:221:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     222:222:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):436:436 -> a
     222:222:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    223:223:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    223:223:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     223:223:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):437 -> a
     223:223:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     224:224:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):437:437 -> a
@@ -32395,12 +32522,12 @@
     225:229:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     230:230:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):432:432 -> a
     230:230:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    231:231:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    231:231:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     231:231:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):448 -> a
     231:231:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     232:232:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):448:448 -> a
     232:232:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    233:233:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    233:233:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     233:233:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):450 -> a
     233:233:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     234:234:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):450:450 -> a
@@ -32411,37 +32538,37 @@
     238:238:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     239:239:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):259:259 -> a
     239:239:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     240:240:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):475 -> a
     240:240:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     241:243:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):474:476 -> a
     241:243:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    244:244:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    244:244:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     244:244:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):480 -> a
     244:244:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     245:246:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):480:481 -> a
     245:246:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    247:247:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    247:247:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     247:247:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):486 -> a
     247:247:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     248:250:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):485:487 -> a
     248:250:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    251:251:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    251:251:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     251:251:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):492 -> a
     251:251:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     252:254:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):491:493 -> a
     252:254:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    255:255:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    255:255:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     255:255:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):498 -> a
     255:255:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     256:258:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):497:499 -> a
     256:258:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    259:259:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    259:259:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     259:259:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):504 -> a
     259:259:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     260:263:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):503:506 -> a
     260:263:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    264:264:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    264:264:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     264:264:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):510 -> a
     264:264:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     265:266:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):510:511 -> a
@@ -32450,22 +32577,22 @@
     267:309:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     310:343:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):130:163 -> a
     344:344:boolean lambda$synthesizeUtilityClass$0(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexProgramClass):160:160 -> a
-    345:345:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    345:345:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     345:345:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):78 -> a
     346:362:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):79:95 -> a
     363:367:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):94:98 -> a
 com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.D.d.f0.a:
     1:4:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1541:1544 -> A
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> A
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> A
     5:5:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1561 -> A
     6:6:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1561:1561 -> A
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> A
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> A
     7:7:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1563 -> A
     8:8:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1563:1563 -> A
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> A
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> A
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1564 -> A
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1564:1564 -> A
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> A
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> A
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1565 -> A
     12:12:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1565:1565 -> A
     13:17:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1562:1566 -> A
@@ -32473,16 +32600,16 @@
     19:42:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1548:1571 -> A
     1:19:com.android.tools.r8.graph.CfCode ShortMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4833:4851 -> A0
     1:5:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1575:1579 -> B
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> B
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> B
     6:6:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1600 -> B
     7:7:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1600:1600 -> B
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> B
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> B
     8:8:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1602 -> B
     9:9:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1602:1602 -> B
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> B
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> B
     10:10:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1603 -> B
     11:11:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1603:1603 -> B
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> B
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> B
     12:12:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1604 -> B
     13:13:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1604:1604 -> B
     14:18:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1601:1605 -> B
@@ -32493,356 +32620,356 @@
     1:16:com.android.tools.r8.graph.CfCode ShortMethods_toUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4873:4888 -> C0
     1:18:com.android.tools.r8.graph.CfCode LongMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1717:1734 -> D
     1:12:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4892:4903 -> D0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     13:13:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4911 -> D0
     14:16:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4911:4913 -> D0
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     17:17:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4917 -> D0
     18:18:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4917:4917 -> D0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     19:19:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4919 -> D0
     20:20:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4919:4919 -> D0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     21:21:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4920 -> D0
     22:22:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4920:4920 -> D0
     23:26:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4918:4921 -> D0
     27:27:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4916:4916 -> D0
-    28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     28:28:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4925 -> D0
     29:29:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4925:4925 -> D0
-    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     30:30:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4930 -> D0
     31:31:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4930:4930 -> D0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     32:32:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4931 -> D0
     33:34:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4931:4932 -> D0
     35:35:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4929:4929 -> D0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     36:36:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4947 -> D0
     37:37:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4947:4947 -> D0
-    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     38:38:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4949 -> D0
     39:39:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4949:4949 -> D0
-    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     40:40:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4950 -> D0
     41:41:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4950:4950 -> D0
     42:45:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4948:4951 -> D0
     46:46:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4946:4946 -> D0
-    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     47:47:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4968 -> D0
     48:48:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4968:4968 -> D0
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     49:49:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4970 -> D0
     50:50:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4970:4970 -> D0
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     51:51:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4971 -> D0
     52:52:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4971:4971 -> D0
     53:56:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4969:4972 -> D0
     57:57:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4967:4967 -> D0
-    58:58:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    58:58:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     58:58:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4983 -> D0
     59:59:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4983:4983 -> D0
-    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     60:60:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4985 -> D0
     61:61:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4985:4985 -> D0
-    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     62:62:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4986 -> D0
     63:63:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4986:4986 -> D0
     64:67:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4984:4987 -> D0
     68:68:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4982:4982 -> D0
-    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     69:69:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4998 -> D0
     70:70:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4998:4998 -> D0
-    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     71:71:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5000 -> D0
     72:72:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5000:5000 -> D0
     73:75:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4999:5001 -> D0
     76:76:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4997:4997 -> D0
     77:176:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4907:5006 -> D0
     1:3:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1738:1740 -> E
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E
     4:4:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1751 -> E
     5:5:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1751:1751 -> E
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E
     6:6:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1753 -> E
     7:7:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1753:1753 -> E
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E
     8:8:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1754 -> E
     9:9:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1754:1754 -> E
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E
     10:10:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1755 -> E
     11:11:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1755:1755 -> E
     12:16:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1752:1756 -> E
     17:17:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1750:1750 -> E
     18:35:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1744:1761 -> E
     1:11:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5010:5020 -> E0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     12:12:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5028 -> E0
     13:15:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5028:5030 -> E0
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     16:16:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5034 -> E0
     17:17:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5034:5034 -> E0
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     18:18:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5036 -> E0
     19:19:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5036:5036 -> E0
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     20:20:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5037 -> E0
     21:21:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5037:5037 -> E0
     22:25:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5035:5038 -> E0
     26:26:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5033:5033 -> E0
-    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     27:27:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5042 -> E0
     28:28:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5042:5042 -> E0
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     29:29:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5047 -> E0
     30:30:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5047:5047 -> E0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     31:31:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5048 -> E0
     32:33:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5048:5049 -> E0
     34:34:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5046:5046 -> E0
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     35:35:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5057 -> E0
     36:36:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5057:5057 -> E0
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     37:37:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5059 -> E0
     38:38:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5059:5059 -> E0
     39:41:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5058:5060 -> E0
     42:42:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5056:5056 -> E0
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     43:43:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5068 -> E0
     44:44:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5068:5068 -> E0
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     45:45:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5069 -> E0
     46:47:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5069:5070 -> E0
     48:48:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5067:5067 -> E0
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     49:49:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5079 -> E0
     50:50:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5079:5079 -> E0
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     51:51:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5081 -> E0
     52:52:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5081:5081 -> E0
     53:55:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5080:5082 -> E0
     56:56:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5078:5078 -> E0
-    57:57:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    57:57:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     57:57:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5084 -> E0
     58:58:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5084:5084 -> E0
-    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     59:59:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5088 -> E0
     60:60:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5088:5088 -> E0
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     61:61:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5090 -> E0
     62:62:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5090:5090 -> E0
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     63:63:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5091 -> E0
     64:64:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5091:5091 -> E0
     65:68:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5089:5092 -> E0
     69:69:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5087:5087 -> E0
-    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     70:70:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5100 -> E0
     71:71:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5100:5100 -> E0
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     72:72:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5101 -> E0
     73:74:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5101:5102 -> E0
     75:75:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5099:5099 -> E0
-    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     76:76:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5111 -> E0
     77:77:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5111:5111 -> E0
-    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     78:78:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5113 -> E0
     79:79:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5113:5113 -> E0
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     80:80:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5114 -> E0
     81:81:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5114:5114 -> E0
     82:85:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5112:5115 -> E0
     86:86:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5110:5110 -> E0
-    87:87:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    87:87:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     87:87:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5124 -> E0
     88:88:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5124:5124 -> E0
-    89:89:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    89:89:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     89:89:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5126 -> E0
     90:90:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5126:5126 -> E0
     91:93:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5125:5127 -> E0
     94:94:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5123:5123 -> E0
-    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     95:95:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5129 -> E0
     96:96:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5129:5129 -> E0
-    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     97:97:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5133 -> E0
     98:98:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5133:5133 -> E0
-    99:99:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    99:99:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     99:99:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5135 -> E0
     100:100:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5135:5135 -> E0
-    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     101:101:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5136 -> E0
     102:102:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5136:5136 -> E0
     103:106:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5134:5137 -> E0
     107:107:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5132:5132 -> E0
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     108:108:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5146 -> E0
     109:109:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5146:5146 -> E0
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     110:110:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5148 -> E0
     111:111:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5148:5148 -> E0
     112:114:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5147:5149 -> E0
     115:115:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5145:5145 -> E0
     116:246:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5024:5154 -> E0
     1:23:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1766:1788 -> F
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     24:24:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1798 -> F
     25:25:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1798:1798 -> F
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     26:26:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1799 -> F
     27:28:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1799:1800 -> F
     29:29:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1797:1797 -> F
-    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     30:30:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1807 -> F
     31:33:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1807:1809 -> F
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     34:34:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1813 -> F
     35:35:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1813:1813 -> F
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     36:36:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1815 -> F
     37:37:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1815:1815 -> F
-    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     38:38:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1816 -> F
     39:39:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1816:1816 -> F
     40:43:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1814:1817 -> F
     44:44:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1812:1812 -> F
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     45:45:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1828 -> F
     46:48:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1828:1830 -> F
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     49:49:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1835 -> F
     50:50:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1835:1835 -> F
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     51:51:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1837 -> F
     52:52:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1837:1837 -> F
-    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     53:53:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1838 -> F
     54:54:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1838:1838 -> F
     55:58:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1836:1839 -> F
     59:59:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1834:1834 -> F
-    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     60:60:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1844 -> F
     61:61:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1844:1844 -> F
-    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     62:62:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1846 -> F
     63:63:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1846:1846 -> F
-    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     64:64:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1847 -> F
     65:65:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1847:1847 -> F
     66:69:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1845:1848 -> F
     70:70:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1843:1843 -> F
-    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     71:71:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1853 -> F
     72:72:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1853:1853 -> F
-    73:73:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    73:73:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     73:73:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1855 -> F
     74:74:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1855:1855 -> F
-    75:75:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    75:75:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     75:75:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1856 -> F
     76:76:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1856:1856 -> F
     77:80:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1854:1857 -> F
     81:81:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1852:1852 -> F
-    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     82:82:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1867 -> F
     83:83:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1867:1867 -> F
-    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     84:84:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1869 -> F
     85:85:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1869:1869 -> F
-    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     86:86:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1870 -> F
     87:87:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1870:1870 -> F
-    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     88:88:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1871 -> F
     89:89:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1871:1871 -> F
     90:94:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1868:1872 -> F
     95:95:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1866:1866 -> F
-    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     96:96:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1881 -> F
     97:97:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1881:1881 -> F
-    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     98:98:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1883 -> F
     99:99:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1883:1883 -> F
-    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     100:100:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1883 -> F
     101:101:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1883:1883 -> F
     102:104:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1882:1884 -> F
     105:105:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1880:1880 -> F
-    106:106:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    106:106:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     106:106:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1913 -> F
     107:107:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1913:1913 -> F
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     108:108:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1915 -> F
     109:109:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1915:1915 -> F
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     110:110:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1915 -> F
     111:111:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1915:1915 -> F
     112:114:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1914:1916 -> F
     115:115:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1912:1912 -> F
-    116:116:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    116:116:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     116:116:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1922 -> F
     117:117:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1922:1922 -> F
-    118:118:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    118:118:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     118:118:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1924 -> F
     119:119:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1924:1924 -> F
-    120:120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    120:120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     120:120:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1925 -> F
     121:121:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1925:1925 -> F
-    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     122:122:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1926 -> F
     123:123:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1926:1926 -> F
     124:128:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1923:1927 -> F
     129:129:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1921:1921 -> F
-    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     130:130:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1935 -> F
     131:131:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1935:1935 -> F
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     132:132:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1941 -> F
     133:133:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1941:1941 -> F
-    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     134:134:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1943 -> F
     135:135:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1943:1943 -> F
-    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     136:136:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1944 -> F
     137:137:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1944:1944 -> F
     138:141:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1942:1945 -> F
     142:142:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1940:1940 -> F
-    143:143:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    143:143:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     143:143:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1969 -> F
     144:144:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1969:1969 -> F
-    145:145:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    145:145:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     145:145:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1971 -> F
     146:146:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1971:1971 -> F
-    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     147:147:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1972 -> F
     148:148:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1972:1972 -> F
-    149:149:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    149:149:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     149:149:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1973 -> F
     150:150:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1973:1973 -> F
     151:155:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1970:1974 -> F
     156:156:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1968:1968 -> F
-    157:157:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    157:157:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     157:157:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1979 -> F
     158:160:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1979:1981 -> F
-    161:161:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    161:161:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     161:161:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1986 -> F
     162:162:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1986:1986 -> F
-    163:163:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    163:163:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     163:163:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1988 -> F
     164:164:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1988:1988 -> F
-    165:165:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    165:165:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     165:165:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1989 -> F
     166:166:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1989:1989 -> F
     167:170:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1987:1990 -> F
     171:171:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1985:1985 -> F
-    172:172:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    172:172:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     172:172:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1995 -> F
     173:173:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1995:1995 -> F
-    174:174:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    174:174:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     174:174:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1997 -> F
     175:175:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1997:1997 -> F
-    176:176:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    176:176:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     176:176:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1998 -> F
     177:177:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1998:1998 -> F
     178:181:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1996:1999 -> F
@@ -32850,171 +32977,171 @@
     183:410:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1792:2019 -> F
     1:101:com.android.tools.r8.graph.CfCode LongMethods_remainderUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2023:2123 -> G
     1:3:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2127:2129 -> H
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> H
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> H
     4:4:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2140 -> H
     5:5:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2140:2140 -> H
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> H
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> H
     6:6:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2142 -> H
     7:7:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2142:2142 -> H
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> H
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> H
     8:8:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2143 -> H
     9:9:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2143:2143 -> H
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> H
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> H
     10:10:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2144 -> H
     11:11:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2144:2144 -> H
     12:16:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2141:2145 -> H
     17:17:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2139:2139 -> H
     18:35:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2133:2150 -> H
     1:39:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2155:2193 -> I
-    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     40:40:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2206 -> I
     41:41:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2206:2206 -> I
-    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     42:42:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2208 -> I
     43:43:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2208:2208 -> I
-    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     44:44:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2209 -> I
     45:45:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2209:2209 -> I
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     46:46:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2210 -> I
     47:47:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2210:2210 -> I
     48:52:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2207:2211 -> I
     53:53:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2205:2205 -> I
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     54:54:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2226 -> I
     55:55:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2226:2226 -> I
-    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     56:56:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2244 -> I
     57:57:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2244:2244 -> I
-    58:58:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    58:58:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     58:58:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2246 -> I
     59:59:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2246:2246 -> I
-    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     60:60:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2246 -> I
     61:61:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2246:2246 -> I
     62:64:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2245:2247 -> I
     65:65:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2243:2243 -> I
-    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     66:66:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2267 -> I
     67:67:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2267:2267 -> I
-    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     68:68:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2269 -> I
     69:69:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2269:2269 -> I
-    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     70:70:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2270 -> I
     71:71:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2270:2270 -> I
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     72:72:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2271 -> I
     73:73:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2271:2271 -> I
     74:78:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2268:2272 -> I
     79:79:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2266:2266 -> I
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     80:80:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2311 -> I
     81:81:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2311:2311 -> I
-    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     82:82:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2313 -> I
     83:83:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2313:2313 -> I
-    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     84:84:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2314 -> I
     85:85:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2314:2314 -> I
-    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     86:86:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2315 -> I
     87:87:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2315:2315 -> I
     88:92:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2312:2316 -> I
     93:93:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2310:2310 -> I
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     94:94:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2337 -> I
     95:95:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2337:2337 -> I
-    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     96:96:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2339 -> I
     97:97:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2339:2339 -> I
-    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     98:98:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2340 -> I
     99:99:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2340:2340 -> I
-    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     100:100:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2341 -> I
     101:101:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2341:2341 -> I
     102:106:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2338:2342 -> I
     107:107:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2336:2336 -> I
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     108:108:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2366 -> I
     109:109:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2366:2366 -> I
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     110:110:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2368 -> I
     111:111:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2368:2368 -> I
-    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     112:112:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2369 -> I
     113:113:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2369:2369 -> I
-    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     114:114:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2370 -> I
     115:115:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2370:2370 -> I
     116:120:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2367:2371 -> I
     121:121:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2365:2365 -> I
-    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     122:122:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2382 -> I
     123:123:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2382:2382 -> I
-    124:124:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    124:124:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     124:124:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2393 -> I
     125:125:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2393:2393 -> I
-    126:126:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    126:126:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     126:126:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2395 -> I
     127:127:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2395:2395 -> I
-    128:128:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    128:128:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     128:128:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2396 -> I
     129:129:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2396:2396 -> I
-    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     130:130:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2397 -> I
     131:131:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2397:2397 -> I
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     132:132:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2398 -> I
     133:133:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2398:2398 -> I
     134:139:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2394:2399 -> I
     140:140:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2392:2392 -> I
     141:359:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2186:2404 -> I
     1:7:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2408:2414 -> J
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> J
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> J
     8:8:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2440 -> J
     9:9:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2440:2440 -> J
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> J
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> J
     10:10:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2445 -> J
     11:11:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2445:2445 -> J
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> J
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> J
     12:12:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2446 -> J
     13:14:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2446:2447 -> J
     15:15:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2444:2444 -> J
     16:50:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2418:2452 -> J
     1:10:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2456:2465 -> K
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> K
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> K
     11:11:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2504 -> K
     12:12:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2504:2504 -> K
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> K
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> K
     13:13:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2509 -> K
     14:14:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2509:2509 -> K
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> K
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> K
     15:15:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2510 -> K
     16:17:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2510:2511 -> K
     18:18:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2508:2508 -> K
     19:66:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2469:2516 -> K
     1:5:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2520:2524 -> L
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> L
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> L
     6:6:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2534 -> L
     7:7:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2534:2534 -> L
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> L
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> L
     8:8:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2539 -> L
     9:9:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2539:2539 -> L
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> L
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> L
     10:10:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2540 -> L
     11:12:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2540:2541 -> L
     13:13:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2538:2538 -> L
     14:37:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2528:2551 -> L
     1:5:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2555:2559 -> M
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> M
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> M
     6:6:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2570 -> M
     7:7:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2570:2570 -> M
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> M
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> M
     8:8:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2575 -> M
     9:9:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2575:2575 -> M
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> M
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> M
     10:10:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2576 -> M
     11:12:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2576:2577 -> M
     13:13:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2574:2574 -> M
@@ -33022,16 +33149,16 @@
     1:55:com.android.tools.r8.graph.CfCode MathMethods_floorDivInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2591:2645 -> N
     1:59:com.android.tools.r8.graph.CfCode MathMethods_floorDivLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2649:2707 -> O
     1:3:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2711:2713 -> P
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> P
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> P
     4:4:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2725 -> P
     5:5:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2725:2725 -> P
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> P
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> P
     6:6:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2727 -> P
     7:7:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2727:2727 -> P
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> P
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> P
     8:8:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2728 -> P
     9:9:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2728:2728 -> P
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> P
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> P
     10:10:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2729 -> P
     11:11:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2729:2729 -> P
     12:16:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2726:2730 -> P
@@ -33040,162 +33167,162 @@
     1:47:com.android.tools.r8.graph.CfCode MathMethods_floorModInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2739:2785 -> Q
     1:51:com.android.tools.r8.graph.CfCode MathMethods_floorModLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2789:2839 -> R
     1:3:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2843:2845 -> S
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> S
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> S
     4:4:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2857 -> S
     5:5:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2857:2857 -> S
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> S
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> S
     6:6:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2859 -> S
     7:7:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2859:2859 -> S
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> S
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> S
     8:8:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2860 -> S
     9:9:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2860:2860 -> S
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> S
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> S
     10:10:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2861 -> S
     11:11:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2861:2861 -> S
     12:16:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2858:2862 -> S
     17:17:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2856:2856 -> S
     18:37:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2849:2868 -> S
     1:5:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2872:2876 -> T
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> T
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> T
     6:6:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2886 -> T
     7:7:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2886:2886 -> T
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> T
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> T
     8:8:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2891 -> T
     9:9:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2891:2891 -> T
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> T
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> T
     10:10:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2892 -> T
     11:12:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2892:2893 -> T
     13:13:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2890:2890 -> T
     14:37:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2880:2903 -> T
     1:5:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2907:2911 -> U
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> U
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> U
     6:6:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2922 -> U
     7:7:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2922:2922 -> U
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> U
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> U
     8:8:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2927 -> U
     9:9:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2927:2927 -> U
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> U
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> U
     10:10:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2928 -> U
     11:12:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2928:2929 -> U
     13:13:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2926:2926 -> U
     14:38:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2915:2939 -> U
     1:7:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2943:2949 -> V
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> V
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> V
     8:8:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2975 -> V
     9:9:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2975:2975 -> V
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> V
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> V
     10:10:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2980 -> V
     11:11:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2980:2980 -> V
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> V
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> V
     12:12:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2981 -> V
     13:14:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2981:2982 -> V
     15:15:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2979:2979 -> V
     16:50:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2953:2987 -> V
     1:18:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2991:3008 -> W
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     19:19:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3019 -> W
     20:20:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3019:3019 -> W
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     21:21:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3021 -> W
     22:22:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3021:3021 -> W
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     23:23:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3021 -> W
     24:24:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3021:3021 -> W
     25:27:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3020:3022 -> W
     28:28:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3018:3018 -> W
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     29:29:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3031 -> W
     30:30:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3031:3031 -> W
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     31:31:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3033 -> W
     32:32:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3033:3033 -> W
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     33:33:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3033 -> W
     34:34:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3033:3033 -> W
     35:37:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3032:3034 -> W
     38:38:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3030:3030 -> W
-    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     39:39:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3042 -> W
     40:40:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3042:3042 -> W
-    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     41:41:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3044 -> W
     42:42:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3044:3044 -> W
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     43:43:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3044 -> W
     44:44:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3044:3044 -> W
     45:47:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3043:3045 -> W
     48:48:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3041:3041 -> W
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     49:49:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3055 -> W
     50:50:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3055:3055 -> W
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     51:51:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3057 -> W
     52:52:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3057:3057 -> W
-    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     53:53:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3057 -> W
     54:54:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3057:3057 -> W
     55:57:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3056:3058 -> W
     58:58:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3054:3054 -> W
-    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     59:59:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3115 -> W
     60:60:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3115:3115 -> W
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     61:61:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3120 -> W
     62:62:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3120:3120 -> W
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     63:63:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3121 -> W
     64:65:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3121:3122 -> W
     66:66:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3119:3119 -> W
     67:182:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3012:3127 -> W
     1:3:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3131:3133 -> X
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> X
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> X
     4:4:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3145 -> X
     5:5:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3145:3145 -> X
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> X
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> X
     6:6:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3147 -> X
     7:7:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3147:3147 -> X
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> X
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> X
     8:8:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3148 -> X
     9:9:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3148:3148 -> X
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> X
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> X
     10:10:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3149 -> X
     11:11:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3149:3149 -> X
     12:16:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3146:3150 -> X
     17:17:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3144:3144 -> X
     18:36:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3137:3155 -> X
     1:5:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3159:3163 -> Y
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> Y
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> Y
     6:6:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3173 -> Y
     7:7:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3173:3173 -> Y
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> Y
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> Y
     8:8:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3178 -> Y
     9:9:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3178:3178 -> Y
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> Y
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> Y
     10:10:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3179 -> Y
     11:12:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3179:3180 -> Y
     13:13:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3177:3177 -> Y
     14:36:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3167:3189 -> Y
     1:5:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3193:3197 -> Z
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> Z
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> Z
     6:6:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3208 -> Z
     7:7:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3208:3208 -> Z
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> Z
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> Z
     8:8:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3213 -> Z
     9:9:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3213:3213 -> Z
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> Z
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> Z
     10:10:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3214 -> Z
     11:12:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3214:3215 -> Z
     13:13:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3212:3212 -> Z
     14:37:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3201:3224 -> Z
     1:28:com.android.tools.r8.graph.CfCode BooleanMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):51:78 -> a
     1:3:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3228:3230 -> a0
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a0
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a0
     4:4:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3241 -> a0
     5:5:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3241:3241 -> a0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a0
     6:6:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3243 -> a0
     7:7:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3243:3243 -> a0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a0
     8:8:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3243 -> a0
     9:9:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3243:3243 -> a0
     10:12:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3242:3244 -> a0
@@ -33203,13 +33330,13 @@
     14:30:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3234:3250 -> a0
     1:21:com.android.tools.r8.graph.CfCode BooleanMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):82:102 -> b
     1:3:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3254:3256 -> b0
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b0
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b0
     4:4:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3267 -> b0
     5:5:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3267:3267 -> b0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b0
     6:6:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3269 -> b0
     7:7:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3269:3269 -> b0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b0
     8:8:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3269 -> b0
     9:9:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3269:3269 -> b0
     10:12:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3268:3270 -> b0
@@ -33217,161 +33344,161 @@
     14:30:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3260:3276 -> b0
     1:15:com.android.tools.r8.graph.CfCode ByteMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):106:120 -> c
     1:7:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3280:3286 -> c0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> c0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> c0
     8:8:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3312 -> c0
     9:9:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3312:3312 -> c0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> c0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> c0
     10:10:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3317 -> c0
     11:11:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3317:3317 -> c0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> c0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> c0
     12:12:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3318 -> c0
     13:14:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3318:3319 -> c0
     15:15:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3316:3316 -> c0
     16:50:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3290:3324 -> c0
     1:19:com.android.tools.r8.graph.CfCode ByteMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):124:142 -> d
     1:10:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3328:3337 -> d0
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> d0
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> d0
     11:11:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3376 -> d0
     12:12:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3376:3376 -> d0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> d0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> d0
     13:13:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3381 -> d0
     14:14:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3381:3381 -> d0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> d0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> d0
     15:15:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3382 -> d0
     16:17:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3382:3383 -> d0
     18:18:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3380:3380 -> d0
     19:66:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3341:3388 -> d0
     1:15:com.android.tools.r8.graph.CfCode ByteMethods_toUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):146:160 -> e
     1:6:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3392:3397 -> e0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> e0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> e0
     7:7:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3413 -> e0
     8:8:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3413:3413 -> e0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> e0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> e0
     9:9:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3418 -> e0
     10:10:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3418:3418 -> e0
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> e0
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> e0
     11:11:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3419 -> e0
     12:13:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3419:3420 -> e0
     14:14:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3417:3417 -> e0
     15:42:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3401:3428 -> e0
     1:16:com.android.tools.r8.graph.CfCode ByteMethods_toUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):164:179 -> f
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3433:3437 -> f0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3455 -> f0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3455:3455 -> f0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3457 -> f0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3457:3457 -> f0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3462 -> f0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3462:3462 -> f0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3463 -> f0
     13:14:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3463:3464 -> f0
     15:20:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3461:3466 -> f0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3470 -> f0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3470:3470 -> f0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3472 -> f0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3472:3472 -> f0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     25:25:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3473 -> f0
     26:26:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3473:3473 -> f0
     27:30:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3471:3474 -> f0
     31:31:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3469:3469 -> f0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     32:32:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3480 -> f0
     33:33:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3480:3480 -> f0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     34:34:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3482 -> f0
     35:35:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3482:3482 -> f0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     36:36:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3483 -> f0
     37:37:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3483:3483 -> f0
     38:41:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3481:3484 -> f0
     42:49:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3479:3486 -> f0
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     50:50:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3490 -> f0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3490:3490 -> f0
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3492 -> f0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3492:3492 -> f0
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3493 -> f0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3493:3493 -> f0
     56:59:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3491:3494 -> f0
     60:60:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3489:3489 -> f0
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     61:61:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3500 -> f0
     62:62:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3500:3500 -> f0
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     63:63:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3502 -> f0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3502:3502 -> f0
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     65:65:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3503 -> f0
     66:66:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3503:3503 -> f0
     67:70:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3501:3504 -> f0
     71:78:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3499:3506 -> f0
-    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     79:79:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3510 -> f0
     80:80:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3510:3510 -> f0
-    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     81:81:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3512 -> f0
     82:82:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3512:3512 -> f0
-    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     83:83:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3513 -> f0
     84:84:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3513:3513 -> f0
     85:88:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3511:3514 -> f0
     89:89:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3509:3509 -> f0
-    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     90:90:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3520 -> f0
     91:91:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3520:3520 -> f0
-    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     92:92:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3522 -> f0
     93:93:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3522:3522 -> f0
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     94:94:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3523 -> f0
     95:95:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3523:3523 -> f0
     96:99:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3521:3524 -> f0
     100:107:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3519:3526 -> f0
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     108:108:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3530 -> f0
     109:109:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3530:3530 -> f0
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     110:110:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3532 -> f0
     111:111:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3532:3532 -> f0
-    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     112:112:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3533 -> f0
     113:113:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3533:3533 -> f0
     114:117:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3531:3534 -> f0
     118:118:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3529:3529 -> f0
-    119:119:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    119:119:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     119:119:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3540 -> f0
     120:120:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3540:3540 -> f0
-    121:121:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    121:121:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     121:121:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3542 -> f0
     122:122:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3542:3542 -> f0
-    123:123:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    123:123:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     123:123:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3543 -> f0
     124:124:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3543:3543 -> f0
     125:128:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3541:3544 -> f0
     129:129:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3539:3539 -> f0
-    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     130:130:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3549 -> f0
     131:131:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3549:3549 -> f0
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     132:132:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3551 -> f0
     133:133:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3551:3551 -> f0
     134:136:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3550:3552 -> f0
     137:137:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3548:3548 -> f0
-    138:138:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    138:138:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     138:138:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3557 -> f0
     139:139:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3557:3557 -> f0
-    140:140:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    140:140:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     140:140:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3559 -> f0
     141:141:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3559:3559 -> f0
-    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     142:142:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3560 -> f0
     143:143:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3560:3560 -> f0
     144:147:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3558:3561 -> f0
@@ -33379,837 +33506,837 @@
     149:277:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3441:3569 -> f0
     1:15:com.android.tools.r8.graph.CfCode CharacterMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):183:197 -> g
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3573:3577 -> g0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3592 -> g0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3592:3592 -> g0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3594 -> g0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3594:3594 -> g0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3599 -> g0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3599:3599 -> g0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3600 -> g0
     13:14:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3600:3601 -> g0
     15:20:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3598:3603 -> g0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3607 -> g0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3607:3607 -> g0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3609 -> g0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3609:3609 -> g0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     25:25:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3610 -> g0
     26:26:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3610:3610 -> g0
     27:30:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3608:3611 -> g0
     31:31:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3606:3606 -> g0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     32:32:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3617 -> g0
     33:33:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3617:3617 -> g0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     34:34:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3619 -> g0
     35:35:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3619:3619 -> g0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     36:36:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3620 -> g0
     37:37:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3620:3620 -> g0
     38:41:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3618:3621 -> g0
     42:49:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3616:3623 -> g0
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     50:50:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3627 -> g0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3627:3627 -> g0
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3629 -> g0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3629:3629 -> g0
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3630 -> g0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3630:3630 -> g0
     56:59:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3628:3631 -> g0
     60:60:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3626:3626 -> g0
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     61:61:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3637 -> g0
     62:62:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3637:3637 -> g0
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     63:63:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3639 -> g0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3639:3639 -> g0
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     65:65:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3640 -> g0
     66:66:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3640:3640 -> g0
     67:70:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3638:3641 -> g0
     71:78:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3636:3643 -> g0
-    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     79:79:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3647 -> g0
     80:80:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3647:3647 -> g0
-    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     81:81:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3649 -> g0
     82:82:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3649:3649 -> g0
-    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     83:83:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3650 -> g0
     84:84:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3650:3650 -> g0
     85:88:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3648:3651 -> g0
     89:89:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3646:3646 -> g0
-    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     90:90:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3657 -> g0
     91:91:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3657:3657 -> g0
-    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     92:92:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3659 -> g0
     93:93:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3659:3659 -> g0
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     94:94:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3660 -> g0
     95:95:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3660:3660 -> g0
     96:99:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3658:3661 -> g0
     100:100:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3656:3656 -> g0
-    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     101:101:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3666 -> g0
     102:102:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3666:3666 -> g0
-    103:103:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    103:103:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     103:103:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3668 -> g0
     104:104:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3668:3668 -> g0
     105:107:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3667:3669 -> g0
     108:108:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3665:3665 -> g0
-    109:109:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    109:109:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     109:109:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3674 -> g0
     110:110:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3674:3674 -> g0
-    111:111:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    111:111:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     111:111:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3676 -> g0
     112:112:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3676:3676 -> g0
-    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     113:113:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3677 -> g0
     114:114:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3677:3677 -> g0
     115:118:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3675:3678 -> g0
     119:119:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3673:3673 -> g0
     120:225:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3581:3686 -> g0
     1:3:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):202:204 -> h
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h
     4:4:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):210 -> h
     5:5:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):210:210 -> h
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h
     6:6:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):216 -> h
     7:7:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):216:216 -> h
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h
     8:8:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):218 -> h
     9:9:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):218:218 -> h
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h
     10:10:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):218 -> h
     11:11:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):218:218 -> h
     12:14:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):217:219 -> h
     15:15:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):215:215 -> h
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h
     16:16:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):224 -> h
     17:17:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):224:224 -> h
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h
     18:18:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):226 -> h
     19:19:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):226:226 -> h
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h
     20:20:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):226 -> h
     21:21:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):226:226 -> h
     22:24:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):225:227 -> h
     25:25:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):223:223 -> h
     26:50:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):208:232 -> h
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3690:3694 -> h0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3706 -> h0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3706:3706 -> h0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3708 -> h0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3708:3708 -> h0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3713 -> h0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3713:3713 -> h0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3714 -> h0
     13:14:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3714:3715 -> h0
     15:20:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3712:3717 -> h0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3721 -> h0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3721:3721 -> h0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3723 -> h0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3723:3723 -> h0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     25:25:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3724 -> h0
     26:26:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3724:3724 -> h0
     27:30:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3722:3725 -> h0
     31:31:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3720:3720 -> h0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     32:32:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3731 -> h0
     33:33:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3731:3731 -> h0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     34:34:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3733 -> h0
     35:35:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3733:3733 -> h0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     36:36:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3734 -> h0
     37:37:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3734:3734 -> h0
     38:41:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3732:3735 -> h0
     42:49:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3730:3737 -> h0
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     50:50:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3741 -> h0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3741:3741 -> h0
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3743 -> h0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3743:3743 -> h0
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3744 -> h0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3744:3744 -> h0
     56:59:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3742:3745 -> h0
     60:60:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3740:3740 -> h0
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     61:61:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3751 -> h0
     62:62:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3751:3751 -> h0
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     63:63:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3753 -> h0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3753:3753 -> h0
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     65:65:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3754 -> h0
     66:66:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3754:3754 -> h0
     67:70:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3752:3755 -> h0
     71:71:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3750:3750 -> h0
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     72:72:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3760 -> h0
     73:73:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3760:3760 -> h0
-    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     74:74:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3762 -> h0
     75:75:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3762:3762 -> h0
     76:78:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3761:3763 -> h0
     79:79:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3759:3759 -> h0
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     80:80:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3768 -> h0
     81:81:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3768:3768 -> h0
-    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     82:82:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3770 -> h0
     83:83:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3770:3770 -> h0
-    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     84:84:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3771 -> h0
     85:85:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3771:3771 -> h0
     86:89:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3769:3772 -> h0
     90:90:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3767:3767 -> h0
     91:173:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3698:3780 -> h0
     1:8:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):516:523 -> i
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     9:9:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):529 -> i
     10:10:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):529:529 -> i
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     11:11:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):536 -> i
     12:12:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):536:536 -> i
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     13:13:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):538 -> i
     14:14:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):538:538 -> i
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     15:15:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):538 -> i
     16:16:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):538:538 -> i
     17:19:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):537:539 -> i
     20:20:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):535:535 -> i
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     21:21:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):564 -> i
     22:22:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):564:564 -> i
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     23:23:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):566 -> i
     24:24:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):566:566 -> i
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     25:25:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):567 -> i
     26:26:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):567:567 -> i
     27:30:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):565:568 -> i
     31:31:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):563:563 -> i
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     32:32:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):573 -> i
     33:33:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):573:573 -> i
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     34:34:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):575 -> i
     35:35:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):575:575 -> i
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     36:36:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):576 -> i
     37:37:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):576:576 -> i
     38:41:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):574:577 -> i
     42:42:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):572:572 -> i
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     43:43:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):588 -> i
     44:44:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):588:588 -> i
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     45:45:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):590 -> i
     46:46:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):590:590 -> i
-    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
+    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     47:47:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):591 -> i
     48:48:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):591:591 -> i
     49:52:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):589:592 -> i
     53:53:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):587:587 -> i
     54:124:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):527:597 -> i
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3784:3788 -> i0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3806 -> i0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3806:3806 -> i0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3808 -> i0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3808:3808 -> i0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3809 -> i0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3809:3809 -> i0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3810 -> i0
     13:13:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3810:3810 -> i0
     14:18:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3807:3811 -> i0
     19:19:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3805:3805 -> i0
     20:45:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3792:3817 -> i0
     1:6:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):601:606 -> j
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     7:7:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):613 -> j
     8:8:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):613:613 -> j
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     9:9:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):620 -> j
     10:10:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):620:620 -> j
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     11:11:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):622 -> j
     12:12:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):622:622 -> j
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     13:13:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):623 -> j
     14:14:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):623:623 -> j
     15:18:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):621:624 -> j
     19:19:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):619:619 -> j
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     20:20:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):631 -> j
     21:21:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):631:631 -> j
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     22:22:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):633 -> j
     23:23:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):633:633 -> j
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     24:24:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):634 -> j
     25:25:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):634:634 -> j
     26:29:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):632:635 -> j
     30:30:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):630:630 -> j
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     31:31:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):640 -> j
     32:32:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):640:640 -> j
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     33:33:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):642 -> j
     34:34:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):642:642 -> j
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     35:35:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):643 -> j
     36:36:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):643:643 -> j
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     37:37:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):644 -> j
     38:38:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):644:644 -> j
     39:43:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):641:645 -> j
     44:44:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):639:639 -> j
     45:86:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):610:651 -> j
     1:41:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3821:3861 -> j0
-    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     42:42:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3879 -> j0
     43:43:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3879:3879 -> j0
-    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     44:44:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3883 -> j0
     45:45:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3883:3883 -> j0
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     46:46:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3886 -> j0
     47:47:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3886:3886 -> j0
-    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     48:48:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3888 -> j0
     49:49:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3888:3888 -> j0
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     50:50:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3892 -> j0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3892:3892 -> j0
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3894 -> j0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3894:3894 -> j0
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3895 -> j0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3895:3895 -> j0
-    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     56:56:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3896 -> j0
     57:57:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3896:3896 -> j0
     58:62:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3893:3897 -> j0
     63:63:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3891:3891 -> j0
-    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3908 -> j0
     65:65:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3908:3908 -> j0
-    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     66:66:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3912 -> j0
     67:67:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3912:3912 -> j0
-    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     68:68:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3915 -> j0
     69:69:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3915:3915 -> j0
-    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     70:70:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3917 -> j0
     71:71:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3917:3917 -> j0
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     72:72:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3921 -> j0
     73:73:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3921:3921 -> j0
-    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     74:74:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3923 -> j0
     75:75:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3923:3923 -> j0
-    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     76:76:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3924 -> j0
     77:77:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3924:3924 -> j0
-    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     78:78:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3925 -> j0
     79:79:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3925:3925 -> j0
     80:84:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3922:3926 -> j0
     85:85:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3920:3920 -> j0
-    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     86:86:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3937 -> j0
     87:87:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3937:3937 -> j0
-    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     88:88:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3941 -> j0
     89:89:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3941:3941 -> j0
-    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     90:90:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3944 -> j0
     91:91:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3944:3944 -> j0
-    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     92:92:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3946 -> j0
     93:93:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3946:3946 -> j0
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     94:94:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3950 -> j0
     95:95:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3950:3950 -> j0
-    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     96:96:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3952 -> j0
     97:97:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3952:3952 -> j0
-    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     98:98:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3953 -> j0
     99:99:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3953:3953 -> j0
-    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     100:100:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3954 -> j0
     101:101:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3954:3954 -> j0
     102:106:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3951:3955 -> j0
     107:107:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3949:3949 -> j0
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     108:108:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3966 -> j0
     109:109:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3966:3966 -> j0
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     110:110:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3970 -> j0
     111:111:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3970:3970 -> j0
-    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     112:112:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3973 -> j0
     113:113:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3973:3973 -> j0
-    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     114:114:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3975 -> j0
     115:115:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3975:3975 -> j0
-    116:116:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    116:116:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     116:116:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3979 -> j0
     117:117:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3979:3979 -> j0
-    118:118:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    118:118:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     118:118:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3981 -> j0
     119:119:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3981:3981 -> j0
-    120:120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    120:120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     120:120:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3982 -> j0
     121:121:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3982:3982 -> j0
-    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     122:122:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3983 -> j0
     123:123:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3983:3983 -> j0
     124:128:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3980:3984 -> j0
     129:129:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3978:3978 -> j0
-    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     130:130:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3995 -> j0
     131:131:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3995:3995 -> j0
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     132:132:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3999 -> j0
     133:133:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3999:3999 -> j0
-    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     134:134:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4002 -> j0
     135:135:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4002:4002 -> j0
-    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     136:136:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4004 -> j0
     137:137:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4004:4004 -> j0
-    138:138:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    138:138:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     138:138:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4008 -> j0
     139:139:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4008:4008 -> j0
-    140:140:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    140:140:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     140:140:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4010 -> j0
     141:141:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4010:4010 -> j0
-    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     142:142:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4011 -> j0
     143:143:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4011:4011 -> j0
-    144:144:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    144:144:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     144:144:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4012 -> j0
     145:145:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4012:4012 -> j0
     146:150:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4009:4013 -> j0
     151:151:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4007:4007 -> j0
-    152:152:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    152:152:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     152:152:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4024 -> j0
     153:153:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4024:4024 -> j0
-    154:154:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    154:154:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     154:154:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4028 -> j0
     155:155:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4028:4028 -> j0
-    156:156:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    156:156:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     156:156:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4031 -> j0
     157:157:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4031:4031 -> j0
-    158:158:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    158:158:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     158:158:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4033 -> j0
     159:159:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4033:4033 -> j0
-    160:160:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    160:160:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     160:160:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4037 -> j0
     161:161:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4037:4037 -> j0
-    162:162:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    162:162:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     162:162:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4039 -> j0
     163:163:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4039:4039 -> j0
-    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     164:164:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4040 -> j0
     165:165:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4040:4040 -> j0
-    166:166:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    166:166:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     166:166:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4041 -> j0
     167:167:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4041:4041 -> j0
     168:172:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4038:4042 -> j0
     173:173:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4036:4036 -> j0
-    174:174:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    174:174:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     174:174:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4053 -> j0
     175:175:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4053:4053 -> j0
-    176:176:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    176:176:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     176:176:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4057 -> j0
     177:177:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4057:4057 -> j0
-    178:178:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    178:178:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     178:178:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4060 -> j0
     179:179:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4060:4060 -> j0
-    180:180:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    180:180:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     180:180:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4062 -> j0
     181:181:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4062:4062 -> j0
-    182:182:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    182:182:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     182:182:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4066 -> j0
     183:183:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4066:4066 -> j0
-    184:184:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    184:184:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     184:184:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4068 -> j0
     185:185:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4068:4068 -> j0
-    186:186:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    186:186:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     186:186:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4069 -> j0
     187:187:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4069:4069 -> j0
-    188:188:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    188:188:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     188:188:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4070 -> j0
     189:189:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4070:4070 -> j0
     190:194:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4067:4071 -> j0
     195:195:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4065:4065 -> j0
-    196:196:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    196:196:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     196:196:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4082 -> j0
     197:197:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4082:4082 -> j0
-    198:198:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    198:198:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     198:198:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4086 -> j0
     199:199:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4086:4086 -> j0
-    200:200:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    200:200:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     200:200:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4089 -> j0
     201:201:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4089:4089 -> j0
-    202:202:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    202:202:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     202:202:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4091 -> j0
     203:203:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4091:4091 -> j0
-    204:204:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    204:204:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     204:204:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4095 -> j0
     205:205:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4095:4095 -> j0
-    206:206:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    206:206:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     206:206:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4097 -> j0
     207:207:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4097:4097 -> j0
-    208:208:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    208:208:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     208:208:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4098 -> j0
     209:209:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4098:4098 -> j0
-    210:210:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    210:210:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     210:210:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4099 -> j0
     211:211:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4099:4099 -> j0
     212:216:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4096:4100 -> j0
     217:217:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4094:4094 -> j0
-    218:218:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    218:218:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     218:218:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4111 -> j0
     219:219:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4111:4111 -> j0
-    220:220:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    220:220:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     220:220:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4115 -> j0
     221:221:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4115:4115 -> j0
-    222:222:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    222:222:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     222:222:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4118 -> j0
     223:223:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4118:4118 -> j0
-    224:224:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    224:224:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     224:224:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4120 -> j0
     225:225:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4120:4120 -> j0
-    226:226:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    226:226:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     226:226:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4124 -> j0
     227:227:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4124:4124 -> j0
-    228:228:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    228:228:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     228:228:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4126 -> j0
     229:229:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4126:4126 -> j0
-    230:230:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    230:230:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     230:230:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4127 -> j0
     231:231:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4127:4127 -> j0
-    232:232:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    232:232:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     232:232:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4128 -> j0
     233:233:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4128:4128 -> j0
     234:238:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4125:4129 -> j0
     239:239:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4123:4123 -> j0
-    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     240:240:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4144 -> j0
     241:241:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4144:4144 -> j0
-    242:242:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    242:242:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     242:242:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4146 -> j0
     243:243:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4146:4146 -> j0
-    244:244:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    244:244:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     244:244:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4147 -> j0
     245:245:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4147:4147 -> j0
     246:249:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4145:4148 -> j0
     250:250:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4143:4143 -> j0
     251:539:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3865:4153 -> j0
     1:11:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):655:665 -> k
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     12:12:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):671 -> k
     13:13:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):671:671 -> k
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     14:14:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):678 -> k
     15:15:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):678:678 -> k
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     16:16:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):680 -> k
     17:17:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):680:680 -> k
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     18:18:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):680 -> k
     19:19:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):680:680 -> k
     20:22:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):679:681 -> k
     23:23:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):677:677 -> k
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     24:24:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):705 -> k
     25:25:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):705:705 -> k
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     26:26:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):707 -> k
     27:27:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):707:707 -> k
     28:30:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):706:708 -> k
     31:31:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):704:704 -> k
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     32:32:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):713 -> k
     33:33:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):713:713 -> k
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     34:34:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):715 -> k
     35:35:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):715:715 -> k
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     36:36:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):716 -> k
     37:37:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):716:716 -> k
     38:41:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):714:717 -> k
     42:42:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):712:712 -> k
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     43:43:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):725 -> k
     44:44:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):725:725 -> k
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     45:45:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):727 -> k
     46:46:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):727:727 -> k
     47:49:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):726:728 -> k
     50:50:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):724:724 -> k
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     51:51:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):733 -> k
     52:52:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):733:733 -> k
-    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     53:53:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):735 -> k
     54:54:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):735:735 -> k
-    55:55:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    55:55:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     55:55:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):736 -> k
     56:56:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):736:736 -> k
     57:60:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):734:737 -> k
     61:61:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):732:732 -> k
-    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     62:62:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):747 -> k
     63:63:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):747:747 -> k
-    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     64:64:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):749 -> k
     65:65:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):749:749 -> k
-    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     66:66:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):750 -> k
     67:67:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):750:750 -> k
-    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     68:68:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):751 -> k
     69:69:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):751:751 -> k
     70:74:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):748:752 -> k
     75:75:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):746:746 -> k
-    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     76:76:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):756 -> k
     77:77:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):756:756 -> k
-    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     78:78:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):758 -> k
     79:79:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):758:758 -> k
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     80:80:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):763 -> k
     81:81:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):763:763 -> k
-    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     82:82:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):764 -> k
     83:84:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):764:765 -> k
     85:90:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):762:767 -> k
-    91:91:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    91:91:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     91:91:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):771 -> k
     92:92:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):771:771 -> k
-    93:93:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    93:93:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     93:93:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):773 -> k
     94:94:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):773:773 -> k
-    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     95:95:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):774 -> k
     96:96:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):774:774 -> k
     97:100:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):772:775 -> k
     101:101:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):770:770 -> k
-    102:102:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    102:102:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     102:102:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):781 -> k
     103:103:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):781:781 -> k
-    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     104:104:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):783 -> k
     105:105:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):783:783 -> k
-    106:106:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    106:106:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     106:106:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):784 -> k
     107:107:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):784:784 -> k
     108:111:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):782:785 -> k
     112:112:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):780:780 -> k
-    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     113:113:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):790 -> k
     114:114:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):790:790 -> k
-    115:115:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    115:115:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     115:115:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):792 -> k
     116:116:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):792:792 -> k
     117:119:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):791:793 -> k
     120:120:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):789:789 -> k
-    121:121:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    121:121:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     121:121:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):798 -> k
     122:122:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):798:798 -> k
-    123:123:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    123:123:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     123:123:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):800 -> k
     124:124:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):800:800 -> k
-    125:125:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    125:125:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     125:125:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):801 -> k
     126:126:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):801:801 -> k
     127:130:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):799:802 -> k
     131:131:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):797:797 -> k
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     132:132:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):813 -> k
     133:133:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):813:813 -> k
-    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     134:134:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):815 -> k
     135:135:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):815:815 -> k
-    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     136:136:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):816 -> k
     137:137:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):816:816 -> k
     138:141:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):814:817 -> k
     142:142:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):812:812 -> k
     143:296:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):669:822 -> k
     1:6:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4157:4162 -> k0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4178 -> k0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4178:4178 -> k0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4180 -> k0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4180:4180 -> k0
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k0
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4181 -> k0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4181:4181 -> k0
     13:16:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4179:4182 -> k0
     17:17:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4177:4177 -> k0
     18:46:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4166:4194 -> k0
     1:9:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):826:834 -> l
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     10:10:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):840 -> l
     11:11:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):840:840 -> l
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     12:12:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):847 -> l
     13:13:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):847:847 -> l
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     14:14:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):849 -> l
     15:15:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):849:849 -> l
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     16:16:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):849 -> l
     17:17:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):849:849 -> l
     18:20:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):848:850 -> l
     21:21:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):846:846 -> l
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     22:22:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):875 -> l
     23:23:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):875:875 -> l
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     24:24:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):877 -> l
     25:25:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):877:877 -> l
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     26:26:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):878 -> l
     27:27:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):878:878 -> l
     28:31:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):876:879 -> l
     32:32:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):874:874 -> l
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     33:33:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):884 -> l
     34:34:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):884:884 -> l
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     35:35:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):886 -> l
     36:36:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):886:886 -> l
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     37:37:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):887 -> l
     38:38:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):887:887 -> l
     39:42:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):885:888 -> l
     43:43:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):883:883 -> l
-    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     44:44:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):892 -> l
     45:45:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):892:892 -> l
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     46:46:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):894 -> l
     47:47:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):894:894 -> l
-    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     48:48:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):899 -> l
     49:49:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):899:899 -> l
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     50:50:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):900 -> l
     51:52:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):900:901 -> l
     53:58:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):898:903 -> l
-    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     59:59:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):907 -> l
     60:60:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):907:907 -> l
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     61:61:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):909 -> l
     62:62:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):909:909 -> l
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     63:63:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):910 -> l
     64:64:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):910:910 -> l
     65:68:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):908:911 -> l
     69:69:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):906:906 -> l
-    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     70:70:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):917 -> l
     71:71:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):917:917 -> l
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     72:72:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):919 -> l
     73:73:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):919:919 -> l
-    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     74:74:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):920 -> l
     75:75:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):920:920 -> l
     76:79:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):918:921 -> l
     80:80:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):916:916 -> l
-    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     81:81:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):926 -> l
     82:82:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):926:926 -> l
-    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     83:83:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):928 -> l
     84:84:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):928:928 -> l
     85:87:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):927:929 -> l
     88:88:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):925:925 -> l
-    89:89:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    89:89:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     89:89:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):934 -> l
     90:90:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):934:934 -> l
-    91:91:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    91:91:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     91:91:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):936 -> l
     92:92:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):936:936 -> l
-    93:93:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    93:93:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     93:93:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):937 -> l
     94:94:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):937:937 -> l
     95:98:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):935:938 -> l
     99:99:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):933:933 -> l
-    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     100:100:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):949 -> l
     101:101:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):949:949 -> l
-    102:102:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    102:102:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     102:102:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):951 -> l
     103:103:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):951:951 -> l
-    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     104:104:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):952 -> l
     105:105:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):952:952 -> l
     106:109:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):950:953 -> l
     110:110:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):948:948 -> l
     111:231:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):838:958 -> l
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4198:4202 -> l0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4217 -> l0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4217:4217 -> l0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4218 -> l0
     9:10:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4218:4219 -> l0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4216:4216 -> l0
     12:31:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4206:4225 -> l0
     1:2:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):963:964 -> m
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> m
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> m
     3:3:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):973 -> m
     4:4:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):973:973 -> m
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> m
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> m
     5:5:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):975 -> m
     6:6:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):975:975 -> m
     7:9:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):974:976 -> m
     10:10:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):972:972 -> m
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> m
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> m
     11:11:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):981 -> m
     12:12:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):981:981 -> m
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> m
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> m
     13:13:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):983 -> m
     14:14:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):983:983 -> m
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> m
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> m
     15:15:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):984 -> m
     16:16:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):984:984 -> m
     17:20:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):982:985 -> m
@@ -34217,18 +34344,18 @@
     22:43:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):968:989 -> m
     1:21:com.android.tools.r8.graph.CfCode ObjectsMethods_isNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4229:4249 -> m0
     1:2:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):993:994 -> n
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> n
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> n
     3:3:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1003 -> n
     4:4:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1003:1003 -> n
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> n
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> n
     5:5:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1005 -> n
     6:6:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1005:1005 -> n
     7:9:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1004:1006 -> n
     10:10:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1002:1002 -> n
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> n
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> n
     11:11:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1011 -> n
     12:12:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1011:1011 -> n
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> n
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> n
     13:13:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1013 -> n
     14:14:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1013:1013 -> n
     15:17:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1012:1014 -> n
@@ -34236,168 +34363,168 @@
     19:39:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):998:1018 -> n
     1:21:com.android.tools.r8.graph.CfCode ObjectsMethods_nonNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4253:4273 -> n0
     1:2:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1023:1024 -> o
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o
     3:3:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1033 -> o
     4:4:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1033:1033 -> o
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o
     5:5:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1035 -> o
     6:6:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1035:1035 -> o
     7:9:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1034:1036 -> o
     10:10:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1032:1032 -> o
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o
     11:11:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1041 -> o
     12:12:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1041:1041 -> o
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o
     13:13:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1043 -> o
     14:14:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1043:1043 -> o
     15:17:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1042:1044 -> o
     18:18:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1040:1040 -> o
     19:39:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1028:1048 -> o
     1:16:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4278:4293 -> o0
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o0
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o0
     17:17:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4297 -> o0
     18:18:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4297:4297 -> o0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o0
     19:19:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4299 -> o0
     20:20:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4299:4299 -> o0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4300 -> o0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4300:4300 -> o0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4301 -> o0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4301:4301 -> o0
     25:29:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4298:4302 -> o0
     30:30:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4296:4296 -> o0
     31:53:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4285:4307 -> o0
     1:4:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052:1055 -> p
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p
     5:5:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1065 -> p
     6:6:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1065:1065 -> p
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p
     7:7:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1067 -> p
     8:8:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1067:1067 -> p
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p
     9:9:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1067 -> p
     10:10:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1067:1067 -> p
     11:13:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1066:1068 -> p
     14:14:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1064:1064 -> p
     15:37:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1059:1081 -> p
     1:17:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4312:4328 -> p0
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     18:18:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4332 -> p0
     19:19:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4332:4332 -> p0
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     20:20:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4334 -> p0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4334:4334 -> p0
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4335 -> p0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4335:4335 -> p0
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4336 -> p0
     25:25:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4336:4336 -> p0
     26:30:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4333:4337 -> p0
     31:31:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4331:4331 -> p0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     32:32:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4339 -> p0
     33:33:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4339:4339 -> p0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     34:34:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4343 -> p0
     35:35:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4343:4343 -> p0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     36:36:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4345 -> p0
     37:37:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4345:4345 -> p0
     38:40:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4344:4346 -> p0
     41:50:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4342:4351 -> p0
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4355 -> p0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4355:4355 -> p0
-    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4357 -> p0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4357:4357 -> p0
-    55:55:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
+    55:55:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4358 -> p0
     56:56:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4358:4358 -> p0
-    57:57:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
+    57:57:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     57:57:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4359 -> p0
     58:58:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4359:4359 -> p0
     59:63:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4356:4360 -> p0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4354:4354 -> p0
     65:110:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4320:4365 -> p0
     1:5:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1085:1089 -> q
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q
     6:6:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1099 -> q
     7:7:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1099:1099 -> q
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q
     8:8:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1101 -> q
     9:9:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1101:1101 -> q
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q
     10:10:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1101 -> q
     11:11:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1101:1101 -> q
     12:14:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1100:1102 -> q
     15:15:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1098:1098 -> q
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q
     16:16:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1109 -> q
     17:17:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1109:1109 -> q
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q
     18:18:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1111 -> q
     19:19:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1111:1111 -> q
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q
     20:20:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1111 -> q
     21:21:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1111:1111 -> q
     22:24:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1110:1112 -> q
     25:25:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1108:1108 -> q
     26:56:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1093:1123 -> q
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4370:4374 -> q0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4383 -> q0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4383:4383 -> q0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4389 -> q0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4389:4389 -> q0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4391 -> q0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4391:4391 -> q0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4392 -> q0
     13:13:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4392:4392 -> q0
     14:17:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4390:4393 -> q0
     18:18:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4388:4388 -> q0
     19:42:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4378:4401 -> q0
     1:5:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1127:1131 -> r
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r
     6:6:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1141 -> r
     7:7:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1141:1141 -> r
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r
     8:8:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1143 -> r
     9:9:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1143:1143 -> r
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r
     10:10:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1143 -> r
     11:11:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1143:1143 -> r
     12:14:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1142:1144 -> r
     15:15:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1140:1140 -> r
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r
     16:16:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1151 -> r
     17:17:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1151:1151 -> r
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r
     18:18:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1153 -> r
     19:19:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1153:1153 -> r
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r
     20:20:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1153 -> r
     21:21:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1153:1153 -> r
     22:24:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1152:1154 -> r
     25:25:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1150:1150 -> r
     26:56:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1135:1165 -> r
     1:10:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4405:4414 -> r0
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r0
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4418 -> r0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4418:4418 -> r0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r0
     13:13:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4420 -> r0
     14:14:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4420:4420 -> r0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r0
     15:15:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4421 -> r0
     16:16:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4421:4421 -> r0
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r0
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r0
     17:17:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4422 -> r0
     18:18:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4422:4422 -> r0
     19:23:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4419:4423 -> r0
@@ -34405,411 +34532,411 @@
     25:42:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4411:4428 -> r0
     1:29:com.android.tools.r8.graph.CfCode IntegerMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1169:1197 -> s
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4432:4436 -> s0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> s0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> s0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4451 -> s0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4451:4451 -> s0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> s0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> s0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4453 -> s0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4453:4453 -> s0
     10:12:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4452:4454 -> s0
     13:13:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4450:4450 -> s0
     14:34:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4440:4460 -> s0
     1:5:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1201:1205 -> t
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t
     6:6:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1226 -> t
     7:7:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1226:1226 -> t
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t
     8:8:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1228 -> t
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1228:1228 -> t
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1229 -> t
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1229:1229 -> t
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t
     12:12:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1230 -> t
     13:13:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1230:1230 -> t
     14:18:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1227:1231 -> t
     19:19:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1225:1225 -> t
     20:47:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1209:1236 -> t
     1:6:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4464:4469 -> t0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4479 -> t0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4479:4479 -> t0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4480 -> t0
     10:11:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4480:4481 -> t0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4478:4478 -> t0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4490 -> t0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4490:4490 -> t0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4492 -> t0
     16:16:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4492:4492 -> t0
     17:19:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4491:4493 -> t0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4489:4489 -> t0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4498 -> t0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4498:4498 -> t0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4500 -> t0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4500:4500 -> t0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     25:25:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4501 -> t0
     26:26:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4501:4501 -> t0
     27:30:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4499:4502 -> t0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4497:4497 -> t0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     32:32:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4510 -> t0
     33:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4510:4510 -> t0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4511 -> t0
     35:36:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4511:4512 -> t0
     37:37:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4509:4509 -> t0
     38:83:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4473:4518 -> t0
     1:30:com.android.tools.r8.graph.CfCode IntegerMethods_divideUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1240:1269 -> u
     1:6:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4523:4528 -> u0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4538 -> u0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4538:4538 -> u0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4539 -> u0
     10:11:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4539:4540 -> u0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4537:4537 -> u0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4549 -> u0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4549:4549 -> u0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4550 -> u0
     16:17:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4550:4551 -> u0
     18:18:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4548:4548 -> u0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4556 -> u0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4556:4556 -> u0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4558 -> u0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4558:4558 -> u0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4558 -> u0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4558:4558 -> u0
     25:27:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4557:4559 -> u0
     28:28:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4555:4555 -> u0
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     29:29:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4567 -> u0
     30:30:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4567:4567 -> u0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4568 -> u0
     32:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4568:4569 -> u0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4566:4566 -> u0
     35:78:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4532:4575 -> u0
     1:3:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1273:1275 -> v
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v
     4:4:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1286 -> v
     5:5:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1286:1286 -> v
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v
     6:6:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1288 -> v
     7:7:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1288:1288 -> v
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v
     8:8:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1289 -> v
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1289:1289 -> v
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1290 -> v
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1290:1290 -> v
     12:16:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1287:1291 -> v
     17:17:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1285:1285 -> v
     18:35:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1279:1296 -> v
     1:6:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4580:4585 -> v0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4595 -> v0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4595:4595 -> v0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4596 -> v0
     10:11:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4596:4597 -> v0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4594:4594 -> v0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4606 -> v0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4606:4606 -> v0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4607 -> v0
     16:17:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4607:4608 -> v0
     18:18:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4605:4605 -> v0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4613 -> v0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4613:4613 -> v0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4615 -> v0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4615:4615 -> v0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4615 -> v0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4615:4615 -> v0
     25:27:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4614:4616 -> v0
     28:28:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4612:4612 -> v0
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     29:29:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4624 -> v0
     30:30:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4624:4624 -> v0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4625 -> v0
     32:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4625:4626 -> v0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4623:4623 -> v0
     35:78:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4589:4632 -> v0
     1:8:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1301:1308 -> w
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1318 -> w
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1318:1318 -> w
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1319 -> w
     12:13:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1319:1320 -> w
     14:14:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1317:1317 -> w
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     15:15:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1329 -> w
     16:16:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1329:1329 -> w
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     17:17:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1331 -> w
     18:18:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1331:1331 -> w
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     19:19:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1331 -> w
     20:20:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1331:1331 -> w
     21:23:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1330:1332 -> w
     24:24:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1328:1328 -> w
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     25:25:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1342 -> w
     26:26:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1342:1342 -> w
-    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     27:27:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1344 -> w
     28:28:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1344:1344 -> w
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     29:29:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1345 -> w
     30:30:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1345:1345 -> w
     31:34:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1343:1346 -> w
     35:35:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1341:1341 -> w
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     36:36:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1355 -> w
     37:37:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1355:1355 -> w
-    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     38:38:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1357 -> w
     39:39:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1357:1357 -> w
-    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     40:40:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1358 -> w
     41:41:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1358:1358 -> w
-    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     42:42:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1359 -> w
     43:43:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1359:1359 -> w
     44:48:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1356:1360 -> w
     49:49:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1354:1354 -> w
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     50:50:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1371 -> w
     51:51:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1371:1371 -> w
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     52:52:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1373 -> w
     53:53:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1373:1373 -> w
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     54:54:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1378 -> w
     55:55:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1378:1378 -> w
-    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     56:56:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1379 -> w
     57:58:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1379:1380 -> w
     59:64:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1377:1382 -> w
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     65:65:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1386 -> w
     66:66:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1386:1386 -> w
-    67:67:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    67:67:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     67:67:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1388 -> w
     68:68:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1388:1388 -> w
-    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     69:69:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1389 -> w
     70:70:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1389:1389 -> w
     71:74:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1387:1390 -> w
     75:75:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1385:1385 -> w
-    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     76:76:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1396 -> w
     77:77:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1396:1396 -> w
-    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     78:78:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1398 -> w
     79:79:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1398:1398 -> w
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     80:80:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1399 -> w
     81:81:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1399:1399 -> w
     82:85:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1397:1400 -> w
     86:93:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1395:1402 -> w
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     94:94:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1406 -> w
     95:95:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1406:1406 -> w
-    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     96:96:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1408 -> w
     97:97:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1408:1408 -> w
-    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     98:98:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1409 -> w
     99:99:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1409:1409 -> w
     100:103:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1407:1410 -> w
     104:104:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1405:1405 -> w
-    105:105:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    105:105:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     105:105:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1416 -> w
     106:106:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1416:1416 -> w
-    107:107:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    107:107:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     107:107:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1418 -> w
     108:108:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1418:1418 -> w
-    109:109:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    109:109:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     109:109:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1419 -> w
     110:110:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1419:1419 -> w
     111:114:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1417:1420 -> w
     115:123:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1415:1423 -> w
-    124:124:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    124:124:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     124:124:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1427 -> w
     125:125:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1427:1427 -> w
-    126:126:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    126:126:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     126:126:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1429 -> w
     127:127:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1429:1429 -> w
-    128:128:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    128:128:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     128:128:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1430 -> w
     129:129:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1430:1430 -> w
     130:133:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1428:1431 -> w
     134:134:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1426:1426 -> w
-    135:135:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    135:135:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     135:135:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1436 -> w
     136:136:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1436:1436 -> w
-    137:137:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    137:137:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     137:137:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1438 -> w
     138:138:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1438:1438 -> w
     139:141:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1437:1439 -> w
     142:142:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1435:1435 -> w
-    143:143:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    143:143:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     143:143:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1444 -> w
     144:144:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1444:1444 -> w
-    145:145:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    145:145:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     145:145:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1446 -> w
     146:146:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1446:1446 -> w
-    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     147:147:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1447 -> w
     148:148:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1447:1447 -> w
     149:152:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1445:1448 -> w
     153:153:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1443:1443 -> w
     154:299:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1312:1457 -> w
     1:6:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4637:4642 -> w0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4652 -> w0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4652:4652 -> w0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4653 -> w0
     10:11:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4653:4654 -> w0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4651:4651 -> w0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4663 -> w0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4663:4663 -> w0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4664 -> w0
     16:17:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4664:4665 -> w0
     18:18:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4662:4662 -> w0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4670 -> w0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4670:4670 -> w0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4672 -> w0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4672:4672 -> w0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4672 -> w0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4672:4672 -> w0
     25:27:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4671:4673 -> w0
     28:28:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4669:4669 -> w0
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     29:29:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4681 -> w0
     30:30:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4681:4681 -> w0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4682 -> w0
     32:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4682:4683 -> w0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4680:4680 -> w0
     35:78:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4646:4689 -> w0
     1:30:com.android.tools.r8.graph.CfCode IntegerMethods_remainderUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1461:1490 -> x
     1:7:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4693:4699 -> x0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4709 -> x0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4709:4709 -> x0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     10:10:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4711 -> x0
     11:11:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4711:4711 -> x0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4712 -> x0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4712:4712 -> x0
     14:17:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4710:4713 -> x0
     18:18:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4708:4708 -> x0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4721 -> x0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4721:4721 -> x0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4722 -> x0
     22:23:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4722:4723 -> x0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4720:4720 -> x0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     25:25:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4734 -> x0
     26:26:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4734:4734 -> x0
-    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
+    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     27:27:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4736 -> x0
     28:28:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4736:4736 -> x0
     29:31:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4735:4737 -> x0
     32:32:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4733:4733 -> x0
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     33:33:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4739 -> x0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4739:4739 -> x0
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     35:35:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4746 -> x0
     36:36:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4746:4746 -> x0
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     37:37:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4748 -> x0
     38:38:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4748:4748 -> x0
-    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
+    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     39:39:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4749 -> x0
     40:40:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4749:4749 -> x0
     41:44:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4747:4750 -> x0
     45:45:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4745:4745 -> x0
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     46:46:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4752 -> x0
     47:47:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4752:4752 -> x0
     48:101:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4703:4756 -> x0
     1:16:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1494:1509 -> y
     1:5:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4760:4764 -> y0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     6:6:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4774 -> y0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4774:4774 -> y0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4775 -> y0
     9:10:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4775:4776 -> y0
     11:11:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4773:4773 -> y0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4784 -> y0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4784:4784 -> y0
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4786 -> y0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4786:4786 -> y0
     16:18:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4785:4787 -> y0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4783:4783 -> y0
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4792 -> y0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4792:4792 -> y0
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4794 -> y0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4794:4794 -> y0
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4795 -> y0
     25:25:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4795:4795 -> y0
     26:29:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4793:4796 -> y0
     30:30:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4791:4791 -> y0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4803 -> y0
     32:32:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4803:4803 -> y0
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     33:33:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4805 -> y0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4805:4805 -> y0
     35:37:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4804:4806 -> y0
     38:38:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4802:4802 -> y0
     39:82:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4768:4811 -> y0
     1:3:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1513:1515 -> z
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> z
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> z
     4:4:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1526 -> z
     5:5:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1526:1526 -> z
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> z
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> z
     6:6:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1528 -> z
     7:7:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1528:1528 -> z
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> z
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> z
     8:8:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1529 -> z
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1529:1529 -> z
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> z
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> z
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1530 -> z
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1530:1530 -> z
     12:16:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1527:1531 -> z
@@ -34836,7 +34963,7 @@
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void rewriteListOfEmpty(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):20:20 -> a
     2:5:void rewriteToCollectionMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory,java.lang.String):35:38 -> a
-    6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> a
+    6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> a
     6:6:void rewriteToCollectionMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory,java.lang.String):38 -> a
     7:9:void rewriteToCollectionMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory,java.lang.String):39:41 -> a
     1:1:void rewriteMapOfEmpty(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):30:30 -> b
@@ -34848,54 +34975,52 @@
     5:6:java.util.Deque com.android.tools.r8.utils.DequeUtils.newArrayDeque(java.lang.Object):13:14 -> a
     7:8:byte[] com.android.tools.r8.utils.StreamUtils.StreamToByteArrayClose(java.io.InputStream):16:17 -> a
     9:13:boolean com.android.tools.r8.ir.optimize.ArgumentRemovalUtils.isPinned(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):16:20 -> a
-    14:15: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):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):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
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):26 -> a
-    32:32:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    32:32:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):26 -> a
-    33:33: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
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):22:22 -> a
-    35:35:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):22 -> a
-    36:36:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    36:36:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):22 -> a
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):22:22 -> a
-    38:39:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Iterable):22:23 -> a
-    40:42:java.util.List com.android.tools.r8.utils.ListUtils.map(java.util.Collection,java.util.function.Function):25:27 -> a
-    43:43:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(int):28:28 -> a
-    44:46:java.util.Set com.android.tools.r8.utils.SetUtils.mapIdentityHashSet(java.util.Set,java.util.function.Function):38:40 -> a
-    47:47:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):57:57 -> a
-    48:48:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):56:56 -> a
-    49:49:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):55:55 -> a
-    50:57:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):58:65 -> a
-    58:64:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:67 -> a
-    65:66:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:62 -> a
-    67:76:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:70 -> a
-    77:84:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:68 -> a
-    85:87:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:63 -> a
-    88:91:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:64 -> a
-    92:97:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:66 -> a
-    98:106:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:69 -> a
-    107:130:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.map(java.lang.Class,java.lang.Object[],java.util.function.Function):83:106 -> a
-    131:131:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.map(java.lang.Class,java.lang.Object[],java.util.function.Function):105:105 -> a
-    132:144:void com.android.tools.r8.utils.ZipUtils.writeToZipStream(java.util.zip.ZipOutputStream,java.lang.String,com.android.tools.r8.ByteDataView,int):83:95 -> a
-    145:152:boolean com.android.tools.r8.utils.ZipUtils.isClassFile(java.lang.String):104:111 -> a
+    14:15:void rewriteHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):18:19 -> a
+    16:16:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> a
+    16:16:void rewriteHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):19 -> a
+    17:18:void rewriteHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):20:21 -> a
+    19:26:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):21:28 -> a
+    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):29 -> a
+    28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):26:26 -> a
+    29:29:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):26 -> a
+    30:30:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin) -> a
+    30:30:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> 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 -> a
+    31:31: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
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):22:22 -> a
+    33:33:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):22 -> a
+    34:34:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    34:34:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):22 -> a
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):22:22 -> a
+    36:37:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Iterable):22:23 -> a
+    38:38:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(int):28:28 -> a
+    39:41:java.util.Set com.android.tools.r8.utils.SetUtils.mapIdentityHashSet(java.util.Set,java.util.function.Function):38:40 -> a
+    42:42:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):57:57 -> a
+    43:43:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):56:56 -> a
+    44:44:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):55:55 -> a
+    45:52:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):58:65 -> a
+    53:59:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:67 -> a
+    60:61:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:62 -> a
+    62:71:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:70 -> a
+    72:79:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:68 -> a
+    80:82:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:63 -> a
+    83:86:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:64 -> a
+    87:92:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:66 -> a
+    93:101:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:69 -> a
+    102:125:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.map(java.lang.Class,java.lang.Object[],java.util.function.Function):83:106 -> a
+    126:126:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.map(java.lang.Class,java.lang.Object[],java.util.function.Function):105:105 -> a
+    127:139:void com.android.tools.r8.utils.ZipUtils.writeToZipStream(java.util.zip.ZipOutputStream,java.lang.String,com.android.tools.r8.ByteDataView,int):83:95 -> a
+    140:147:boolean com.android.tools.r8.utils.ZipUtils.isClassFile(java.lang.String):104:111 -> a
     boolean com.android.tools.r8.utils.NumberUtils.is32Bit(long) -> b
     1:2:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):16:17 -> b
     3:9:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteRequireNonNull(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):29:35 -> b
     10:11:boolean com.android.tools.r8.utils.ZipUtils.isDexFile(java.lang.String):99:100 -> b
     1:3:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteToArraysHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):19:21 -> c
-    4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> c
+    4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> c
     4:4:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteToArraysHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):21 -> c
     5:7:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteToArraysHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):22:24 -> c
 com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.D.d.f0.f:
@@ -34987,10 +35112,10 @@
     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:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMethodWithDynamicDispatch():1124:1124 -> a
     21:21:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):96 -> a
     22:31:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):97:106 -> a
-    32:32:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMethodWithDynamicDispatch():1120:1120 -> a
+    32:32:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMethodWithDynamicDispatch():1124:1124 -> a
     32:32:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):106 -> a
     33:33:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):108:108 -> a
     34:50:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):106:122 -> a
@@ -35003,7 +35128,7 @@
     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:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     108:108:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):193 -> a
     109:119:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):194:204 -> a
     120:120:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
@@ -35012,7 +35137,7 @@
     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:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     124:124:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):208 -> a
     125:138:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):210:223 -> a
     139:139:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
@@ -35049,7 +35174,7 @@
     2:33:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):106:137 -> a
     34:51:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):258:275 -> a
     34:51:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
-    52:52:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    52:52:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     52:52:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):281 -> a
     52:52:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
     53:54:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):281:282 -> a
@@ -35087,13 +35212,13 @@
     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():879:879 -> a
+    161:161:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     161:161:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):175 -> a
     162:188:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):176:202 -> a
-    189:189:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    189:189:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     189:189:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203 -> a
     190:190:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203:203 -> a
-    191:191:void com.android.tools.r8.utils.IteratorUtils.removeIf(com.android.tools.r8.ir.code.InstructionListIterator,java.util.function.Predicate):49:49 -> a
+    191:191:void com.android.tools.r8.utils.IteratorUtils.removeIf(com.android.tools.r8.ir.code.InstructionListIterator,java.util.function.Predicate):84:84 -> a
     191:191:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203 -> a
     192:231:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):209:248 -> a
     232:232:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
@@ -35115,12 +35240,12 @@
     586:587:boolean com.android.tools.r8.graph.DexClass.definesStaticField(com.android.tools.r8.graph.DexField):445:446 -> a
     586:587:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):365 -> a
     588:588:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):366:366 -> a
-    589:593:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():815:819 -> a
+    589:593:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():819:823 -> a
     589:593:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):371 -> a
     594:612:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):374:392 -> a
     613:616:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):487:490 -> a
     613:616:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):399 -> a
-    617:617:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    617:617:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     617:617:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):490 -> a
     617:617:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):399 -> a
     618:621:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):491:494 -> a
@@ -35129,7 +35254,7 @@
     630:630:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
     630:630:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):408 -> a
     631:640:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):409:418 -> a
-    641:641:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    641:641:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     641:641:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):490 -> a
     641:641:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):399 -> a
     642:674:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):421:453 -> a
@@ -35147,705 +35272,694 @@
     6:10:void execute():85:89 -> a
     11:11:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
     11:11:void execute():84 -> a
-com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.D.e.s:
+com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.D.e.r:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.utils.InternalOptions options -> d
     com.android.tools.r8.ir.conversion.IRConverter converter -> a
-    1:1:void <clinit>():147:147 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):166:170 -> <init>
-    boolean lambda$computeConstantArrayValues$11(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Instruction) -> a
-    1:1:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):244:244 -> a
-    2:25:void collapseTrivialGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.List):328:351 -> a
-    26:26:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):418:418 -> a
-    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():1271:1271 -> a
-    27:27:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):418 -> a
-    28:29:boolean com.android.tools.r8.ir.code.IRCode.hasCatchHandlers():580:581 -> a
-    28:29:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):418 -> a
-    30:41:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):425:436 -> a
+    1:1:void <clinit>():131:131 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):150:154 -> <init>
+    boolean lambda$computeConstantArrayValues$9(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Instruction) -> a
+    1:1:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):228:228 -> a
+    2:25:void collapseTrivialGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.List):312:335 -> a
+    26:26:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):402:402 -> a
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():1273:1273 -> a
+    27:27:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):402 -> a
+    28:29:boolean com.android.tools.r8.ir.code.IRCode.hasCatchHandlers():625:626 -> a
+    28:29:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):402 -> a
+    30:41:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):409:420 -> a
     42:42:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
-    42:42:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):436 -> a
-    43:50:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):437:444 -> a
-    51:87:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):596:632 -> a
-    88:88:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):460:460 -> a
-    88:88:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):633 -> a
-    89:103:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):634:648 -> a
-    104:104:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):460:460 -> a
-    104:104:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):649 -> a
-    105:114:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):650:659 -> a
-    115:128:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):709:722 -> a
-    129:129:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):719:719 -> a
-    130:141:void tryAddToBiggestSavings(java.util.Set,java.util.PriorityQueue,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,int):732:743 -> a
-    142:149:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):748:755 -> a
-    150:150:int codeUnitMargin():762:762 -> a
-    151:151:int lambda$rewriteSwitch$1(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):924:924 -> a
-    152:155:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1205:1208 -> a
-    156:162:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1207:1213 -> a
-    163:163:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1212:1212 -> a
-    164:217:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1229:1282 -> a
-    218:262:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1257:1301 -> a
-    263:329:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeClassInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):1458:1524 -> a
-    330:330:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):1555:1555 -> a
-    331:335:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):1558:1562 -> a
-    336:351:boolean isKotlinNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):1617:1632 -> a
-    336:351:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):1564 -> a
-    352:371:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):1565:1584 -> a
-    372:377:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):1583:1588 -> a
-    378:385:boolean isInstantiationOfNullPointerException(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.graph.DexItemFactory):1651:1658 -> a
-    378:385:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):1588 -> a
-    386:406:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):1589:1609 -> a
-    407:409:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1640:1642 -> a
-    410:410:boolean triggersClassInitializationBeforeSideEffect(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1672:1672 -> a
-    411:427:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$triggersClassInitializationBeforeSideEffect$4(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):1675:1691 -> a
-    428:487:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):1703:1762 -> a
-    488:528:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):1722:1762 -> a
-    529:542:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):1749:1762 -> a
-    543:543:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1770:1770 -> a
-    544:544: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
-    544:544:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1769 -> a
-    545:551:com.android.tools.r8.graph.DexType getArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1780:1786 -> a
-    545:551:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1773 -> a
-    552:552:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1773:1773 -> a
-    553:553: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
-    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():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
-    591:591: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):1964:1964 -> a
-    592:599:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2106:2113 -> a
-    600:600: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
-    600:600:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2113 -> a
-    601:601:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    601:601:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2114 -> a
-    602:602:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2116:2116 -> a
-    603:603:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    603:603:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2117 -> a
-    604:605:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2118:2119 -> a
-    606:606:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    606:606:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2119 -> a
-    607:624:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2120:2137 -> a
-    625:640:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2136:2151 -> a
-    641:641:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    641:641:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2152 -> a
-    642:643:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2153:2154 -> a
-    644:644:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    644:644:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2155 -> a
-    645:658:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2156:2169 -> a
-    659:659:boolean lambda$removeInstanceOfInstructionIfTrivial$5(com.android.tools.r8.ir.code.Value):2148:2148 -> a
-    660:665:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):2176:2181 -> a
-    666:676:void removeOrReplaceByDebugLocalWrite(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2186:2196 -> a
-    677:678:boolean lambda$shortenLiveRanges$7(com.android.tools.r8.ir.code.ConstInstruction):2367:2368 -> a
-    679:680:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):2431:2432 -> a
-    681:681:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    681:681:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):2433 -> a
-    682:704:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):2434:2456 -> a
-    705:705:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    705:705:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):2457 -> a
-    706:719:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):2458:2471 -> a
-    720:720:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
-    720:720:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):2476 -> a
-    721:764:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):2480:2523 -> a
-    765:775:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):2528:2538 -> a
-    776:776:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
-    776:776:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):2538 -> a
-    777:777:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):2539:2539 -> a
-    778:778:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    778:778:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):2540 -> a
-    779:781:boolean lambda$insertConstantInBlock$10(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):2534:2536 -> a
-    782:782:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():1232:1232 -> a
-    782:782:boolean lambda$insertConstantInBlock$10(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):2537 -> a
-    783:783:boolean lambda$insertConstantInBlock$10(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):2537:2537 -> a
-    784:831:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):2575:2622 -> a
-    832:837:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2950:2955 -> a
-    838:838:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2971:2971 -> a
-    839:845:boolean hasCSECandidate(com.android.tools.r8.ir.code.IRCode,int):2959:2965 -> a
-    839:845:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2972 -> a
-    846:848:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2974:2976 -> a
-    849:849:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
-    849:849:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2976 -> a
-    850:856:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2977:2983 -> a
-    857:857:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    857:857:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2984 -> a
-    858:863:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2985:2990 -> a
-    864:873:boolean shareCatchHandlers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2937:2946 -> a
-    864:873:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2991 -> a
-    874:889:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2992:3007 -> a
-    890:891:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):3138:3139 -> a
-    892:892:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):3304:3304 -> a
-    893:893:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1009:1009 -> a
-    893:893:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):3304 -> a
-    894:895:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):3304:3305 -> a
-    896:923: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):3315:3342 -> a
-    924:924:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1009:1009 -> a
-    924:924: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):3346 -> a
-    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: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
-    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:66:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3386:3397 -> b
-    67:67:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> b
-    67:67:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3398 -> b
-    68:86:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3399:3417 -> b
-    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):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
-    99:99:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3434 -> b
-    100:100:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3437:3437 -> b
-    101:101:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> b
-    101:101:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3438 -> b
-    102:103:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3439:3440 -> b
-    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):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
-    95:95:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1324:1324 -> c
-    96:96:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1320:1320 -> c
-    97:100:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2289:2292 -> c
-    101:109:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2307:2315 -> c
-    101:109:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2293 -> c
-    110:110:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> c
-    110:110:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2315 -> c
-    110:110:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2293 -> c
-    111:113:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2315:2317 -> c
-    111:113:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2293 -> c
-    114:121:boolean hasPath(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2338:2345 -> c
-    114:121:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2318 -> c
-    114:121:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2293 -> c
-    122:123:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2323:2324 -> c
-    122:123:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2293 -> c
-    124:124:java.util.List lambda$shortenLiveRangesInsideBlock$9(com.android.tools.r8.ir.code.BasicBlock):2517:2517 -> c
-    125:175:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3164:3214 -> c
-    176:176:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1009:1009 -> c
-    176:176:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3215 -> c
-    177:186:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3217:3226 -> c
-    187:187:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3225:3225 -> c
-    188:188:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1009:1009 -> c
-    188:188:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3232 -> c
-    189:189:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3235:3235 -> c
-    190:203:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3234:3247 -> c
-    204:204:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3246:3246 -> c
-    205:205:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1009:1009 -> c
-    205:205:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3253 -> c
-    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():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):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
+    42:42:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):420 -> a
+    43:43:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.InstructionListIterator.split(com.android.tools.r8.ir.code.IRCode,int):126:126 -> a
+    43:43:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):421 -> a
+    44:49:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):423:428 -> a
+    50:86:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):580:616 -> a
+    87:87:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):444:444 -> a
+    87:87:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):617 -> a
+    88:102:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):618:632 -> a
+    103:103:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):444:444 -> a
+    103:103:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):633 -> a
+    104:113:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):634:643 -> a
+    114:127:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):693:706 -> a
+    128:128:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):703:703 -> a
+    129:140:void tryAddToBiggestSavings(java.util.Set,java.util.PriorityQueue,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,int):716:727 -> a
+    141:148:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):732:739 -> a
+    149:149:int codeUnitMargin():746:746 -> a
+    150:150:int lambda$rewriteSwitch$1(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):908:908 -> a
+    151:151:void lambda$removeSwitchMaps$2(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1082:1082 -> a
+    152:152:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1146:1146 -> a
+    153:153:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    153:153:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1145 -> a
+    154:160:com.android.tools.r8.graph.DexType getArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1156:1162 -> a
+    154:160:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1149 -> a
+    161:161:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1149:1149 -> a
+    162:162:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    162:162:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1148 -> a
+    163:165:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1150:1152 -> a
+    166:179:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1306:1319 -> a
+    180:180:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
+    180:180:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1324 -> a
+    181:185:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1325:1329 -> a
+    186:186:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    186:186:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1330 -> a
+    187:199:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1330:1342 -> a
+    200:200:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    200:200:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1341 -> a
+    201:201:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1340:1340 -> a
+    202:209:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1482:1489 -> a
+    210:210:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    210:210:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1489 -> a
+    211:211:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    211:211:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1490 -> a
+    212:212:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1492:1492 -> a
+    213:213:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    213:213:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1493 -> a
+    214:215:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1494:1495 -> a
+    216:216:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
+    216:216:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1495 -> a
+    217:234:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1496:1513 -> a
+    235:250:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1512:1527 -> a
+    251:251:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    251:251:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1528 -> a
+    252:253:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1529:1530 -> a
+    254:254:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
+    254:254:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1531 -> a
+    255:268:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1532:1545 -> a
+    269:269:boolean lambda$removeInstanceOfInstructionIfTrivial$3(com.android.tools.r8.ir.code.Value):1524:1524 -> a
+    270:275:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1552:1557 -> a
+    276:286:void removeOrReplaceByDebugLocalWrite(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1562:1572 -> a
+    287:288:boolean lambda$shortenLiveRanges$5(com.android.tools.r8.ir.code.ConstInstruction):1738:1739 -> a
+    289:290:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1802:1803 -> a
+    291:291:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    291:291:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1804 -> a
+    292:314:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1805:1827 -> a
+    315:315:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    315:315:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1828 -> a
+    316:329:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1829:1842 -> a
+    330:330:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    330:330:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1847 -> a
+    331:374:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1851:1894 -> a
+    375:385:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):1899:1909 -> a
+    386:386:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    386:386:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):1909 -> a
+    387:387:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):1910:1910 -> a
+    388:388:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    388:388:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):1911 -> a
+    389:391:boolean lambda$insertConstantInBlock$8(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):1905:1907 -> a
+    392:392:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():1234:1234 -> a
+    392:392:boolean lambda$insertConstantInBlock$8(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):1908 -> a
+    393:393:boolean lambda$insertConstantInBlock$8(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):1908:1908 -> a
+    394:441:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):1946:1993 -> a
+    442:447:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2321:2326 -> a
+    448:448:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2342:2342 -> a
+    449:455:boolean hasCSECandidate(com.android.tools.r8.ir.code.IRCode,int):2330:2336 -> a
+    449:455:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2343 -> a
+    456:458:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2345:2347 -> a
+    459:459:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
+    459:459:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2347 -> a
+    460:466:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2348:2354 -> a
+    467:467:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    467:467:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2355 -> a
+    468:473:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2356:2361 -> a
+    474:483:boolean shareCatchHandlers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2308:2317 -> a
+    474:483:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2362 -> a
+    484:499:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2363:2378 -> a
+    500:501:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2509:2510 -> a
+    502:502:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2675:2675 -> a
+    503:503:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> a
+    503:503:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2675 -> a
+    504:505:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2675:2676 -> a
+    506:533:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2686:2713 -> a
+    534:534:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> a
+    534:534:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2717 -> a
+    535:549:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2732:2746 -> a
+    550:575:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):2920:2945 -> a
+    576:580:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):2956:2960 -> a
+    581:601:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3117:3137 -> a
+    602:602:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):40:40 -> a
+    602:602:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3137 -> a
+    603:619:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3137:3153 -> a
+    620:620:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    620:620:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3152 -> a
+    621:621:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    621:621:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3151 -> a
+    622:633:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3151:3162 -> a
+    634:656:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3173:3195 -> a
+    657:657:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167:167 -> a
+    657:657:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3195 -> a
+    658:658:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3196:3196 -> a
+    659:693:java.util.Set computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3233:3267 -> a
+    659:693:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3200 -> a
+    694:700:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3201:3207 -> a
+    701:701:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    701:701:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3208 -> a
+    702:716:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3209:3223 -> a
+    717:717:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):168:168 -> a
+    717:717:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3223 -> a
+    718:722:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3278:3282 -> a
+    723:723:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167:167 -> a
+    723:723:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3282 -> a
+    724:728:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3283:3287 -> a
+    729:729:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3340:3340 -> a
+    730:739:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3346:3355 -> a
+    730:739:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3342 -> a
+    740:740:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3352:3352 -> a
+    740:740:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3342 -> a
+    741:741:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    741:741:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3352 -> a
+    741:741:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3342 -> a
+    742:742:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3352:3352 -> a
+    742:742:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3342 -> a
+    743:744:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3361:3362 -> a
+    745:745:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    745:745:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3363 -> a
+    746:746:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3365:3365 -> a
+    747:747:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    747:747:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3365 -> a
+    748:749:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3365:3366 -> a
+    750:759:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3376:3385 -> a
+    760:760:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    760:760:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3386 -> a
+    761:761:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.InstructionListIterator.split(com.android.tools.r8.ir.code.IRCode):99:99 -> a
+    761:761:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3387 -> a
+    762:762:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    762:762:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3388 -> a
+    763:764:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3391:3392 -> a
+    765:765:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    765:765:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3392 -> a
+    766:766:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3393:3393 -> a
+    767:767:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    767:767:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3393 -> a
+    768:768:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3396:3396 -> a
+    769:769:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    769:769:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3396 -> a
+    770:770:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    770:770:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3395 -> a
+    771:772:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3398:3399 -> a
+    773:773:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> a
+    773:773:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3399 -> a
+    774:774:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3400:3400 -> a
+    775:775:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> a
+    775:775:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3400 -> a
+    776:776:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3402:3402 -> a
+    777:777:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1242:1242 -> a
+    777:777:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3404 -> a
+    778:778:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3404:3404 -> a
+    779:779:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    779:779:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3402 -> a
+    780:781:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3406:3407 -> a
+    782:782:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    782:782:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3407 -> a
+    783:784:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3409:3410 -> a
+    785:785:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    785:785:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3410 -> a
+    786:794:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3412:3420 -> a
+    795:795:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    795:795:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3420 -> a
+    796:815:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3421:3440 -> a
+    816:819:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata):1392:1395 -> a
+    816:819:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3440 -> a
+    820:839:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3441:3460 -> a
+    840:840:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    840:840:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3460 -> a
+    841:843:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3461:3463 -> a
+    844:844:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    844:844:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3463 -> a
+    845:846:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3464:3465 -> a
+    847:847:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    847:847:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3464 -> a
+    848:848:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3466:3466 -> a
+    849:849:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    849:849:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3466 -> a
+    850:853:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3469:3472 -> a
+    854:854:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    854:854:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3472 -> a
+    855:855:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3474:3474 -> a
+    856:856:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    856:856:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3474 -> a
+    857:857:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3479:3479 -> a
+    858:865:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3483:3490 -> a
+    866:876:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3503:3513 -> a
+    866:876:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    877:877:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3491:3491 -> a
+    878:903:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):3536:3561 -> a
+    878:903:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3491 -> a
+    904:908:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3492:3496 -> a
+    909:909:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3493:3493 -> a
+    910:910:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    910:910:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3493 -> a
+    911:911:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    911:911:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    911:911:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3493 -> a
+    912:912:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3493:3493 -> a
+    913:913:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3511:3511 -> a
+    913:913:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    914:914:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    914:914:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3511 -> a
+    914:914:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    915:915:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    915:915:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    915:915:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3511 -> a
+    915:915:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    916:916:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3511:3511 -> a
+    916:916:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    917:917:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3507:3507 -> a
+    917:917:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    918:918:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    918:918:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3507 -> a
+    918:918:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    919:919:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    919:919:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    919:919:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3507 -> a
+    919:919:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    920:920:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3507:3507 -> a
+    920:920:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    921:927:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):3517:3523 -> a
+    1:2:boolean isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):300:301 -> b
+    3:12:void unlinkTrivialGotoBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):340:349 -> b
+    13:13:boolean lambda$shortenLiveRanges$6(com.android.tools.r8.ir.code.ConstInstruction):1747:1747 -> b
+    14:25:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2757:2768 -> b
+    26:26:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> b
+    26:26:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2769 -> b
+    27:45:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2770:2788 -> b
+    46:46:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> b
+    46:46:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2796 -> b
+    47:53:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2797:2803 -> b
+    54:55:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1055:1056 -> b
+    54:55:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2803 -> b
+    56:57:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2804:2805 -> b
+    58:58:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> b
+    58:58:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2805 -> b
+    59:59:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2808:2808 -> b
+    60:60:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> b
+    60:60:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2809 -> b
+    61:62:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2810:2811 -> b
+    63:63:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> b
+    63:63:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2776 -> b
+    64:65:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2814:2815 -> b
+    66:66:boolean lambda$logArgumentTypes$12(com.android.tools.r8.ir.code.Instruction):3385:3385 -> b
+    67:69:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$13():3624:3626 -> b
+    70:70:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$13():3624:3624 -> b
+    1:4:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1660:1663 -> c
+    5:13:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1678:1686 -> c
+    5:13:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
+    14:14:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> c
+    14:14:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1686 -> c
+    14:14:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
+    15:17:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1686:1688 -> c
+    15:17:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
+    18:25:boolean hasPath(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):1709:1716 -> c
+    18:25:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1689 -> c
+    18:25:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
+    26:27:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1694:1695 -> c
+    26:27:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
+    28:28:java.util.List lambda$shortenLiveRangesInsideBlock$7(com.android.tools.r8.ir.code.BasicBlock):1888:1888 -> c
+    29:79:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2535:2585 -> c
+    80:80:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> c
+    80:80:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2586 -> c
+    81:90:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2588:2597 -> c
+    91:91:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2596:2596 -> c
+    92:92:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> c
+    92:92:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2603 -> c
+    93:93:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2606:2606 -> c
+    94:107:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2605:2618 -> c
+    108:108:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2617:2617 -> c
+    109:109:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> c
+    109:109:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2624 -> c
+    110:110:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2627:2627 -> c
+    111:130:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2626:2645 -> c
+    1:1:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):167:167 -> d
+    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> d
+    2:2:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):169 -> d
+    3:25:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):171:193 -> d
+    26:26:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1089:1089 -> d
+    26:26:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):205 -> d
+    27:28:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):208:209 -> d
     29:29:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> d
-    29:29:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):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
+    29:29:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):209 -> d
+    30:33:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):209:212 -> d
+    1:6:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1049:1054 -> e
     7:45:com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo com.android.tools.r8.ir.optimize.SwitchUtils.analyzeSwitchOverEnum(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):63:101 -> e
-    7:45:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1070 -> e
-    46:53:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1072:1079 -> e
+    7:45:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1054 -> e
+    46:53:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1056:1063 -> e
     54:54:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> e
     54:54:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> e
-    54:54:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1079 -> e
-    55:66:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1080:1091 -> e
+    54:54:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1063 -> e
+    55:66:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1064:1075 -> e
     67:67:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> e
-    67:67:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1093 -> e
-    68:76:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1096:1104 -> e
+    67:67:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1077 -> e
+    68:76:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1080:1088 -> e
     77:77:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> e
-    77:77:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1070 -> e
-    1:27:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1978:2004 -> f
+    77:77:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1054 -> e
+    1:27:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1354:1380 -> f
     28:28:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> f
-    28:28:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):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():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
-    37:50:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2013 -> f
-    51:51:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtCheckCastVerifierBug():1399:1399 -> f
-    51:51:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):2055 -> f
-    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
+    28:28:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1380 -> f
+    29:29:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1381:1381 -> f
+    30:30:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> f
+    30:30:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1382 -> f
+    31:36:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1384:1389 -> f
+    37:50:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1418:1431 -> f
+    37:50:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    51:51:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtCheckCastVerifierBug():1401:1401 -> f
+    51:51:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1431 -> f
+    51:51:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    52:54:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1432:1434 -> f
+    52:54:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
     55:55:boolean com.android.tools.r8.graph.DexType.isFloatType():216:216 -> f
-    55:55:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):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
-    56:63:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2013 -> f
+    55:55:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1434 -> f
+    55:55:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    56:63:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1435:1442 -> f
+    56:63:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
     64:64:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> f
-    64:64:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):2066 -> f
-    64:64:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2013 -> f
-    65:93:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):2068:2096 -> f
-    65:93:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2013 -> f
+    64:64:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1442 -> f
+    64:64:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    65:93:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1444:1472 -> f
+    65:93:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
     94:94:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> f
-    94:94:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):2096 -> f
-    94:94:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2013 -> f
-    95:97:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):2096:2098 -> f
-    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():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
-    19:19:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3660 -> g
-    20:61:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3661:3702 -> g
-    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():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
-    14:14:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3723 -> h
-    15:29:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3724:3738 -> h
-    30:30:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> h
-    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():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
+    94:94:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1472 -> f
+    94:94:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    95:97:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1472:1474 -> f
+    95:97:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    98:120:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1390:1412 -> f
+    1:1:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3011:3011 -> g
+    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> g
+    2:2:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3015 -> g
+    3:18:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3016:3031 -> g
+    19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> g
+    19:19:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3031 -> g
+    20:61:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3032:3073 -> g
+    62:62:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> g
+    62:62:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3031 -> g
+    63:63:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3078:3078 -> g
+    1:1:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> h
+    1:1:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3082 -> h
+    2:13:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3083:3094 -> h
+    14:14:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> h
+    14:14:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3094 -> h
+    15:27:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3095:3107 -> h
+    28:28:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> h
+    28:28:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3108 -> h
+    29:29:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3109:3109 -> h
+    30:30:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> h
+    30:30:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3094 -> h
+    31:31:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3113:3113 -> h
+    1:1:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1167:1167 -> i
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> i
+    2:2:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1167 -> i
+    3:14:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1170:1181 -> i
     15:15:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> i
-    15:15:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1806 -> i
-    16:36:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1807:1827 -> i
-    37:72:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1826:1861 -> i
+    15:15:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1182 -> i
+    16:36:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1183:1203 -> i
+    37:72:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1202:1237 -> i
     73:73:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> i
-    73:73:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1844 -> i
-    74:76:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1870:1872 -> i
-    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
+    73:73:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1220 -> i
+    74:76:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1246:1248 -> i
+    77:77:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):475:475 -> i
+    77:77:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1249 -> i
+    78:84:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1250:1256 -> i
     85:85:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> i
-    85:85:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):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
+    85:85:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1256 -> i
+    86:88:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1256:1258 -> i
+    1:10:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):843:852 -> j
     11:11:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> j
-    11:11:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):869 -> j
-    12:14:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):870:872 -> j
-    15:22:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1017:1024 -> j
-    15:22:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):874 -> j
-    23:25:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.IntSwitch,int):1043:1045 -> j
-    23:25:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1028 -> j
-    23:25:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):874 -> j
-    26:34:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1029:1037 -> j
-    26:34:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):874 -> j
-    35:35:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):876:876 -> j
+    11:11:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):853 -> j
+    12:14:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):854:856 -> j
+    15:22:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1001:1008 -> j
+    15:22:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):858 -> j
+    23:25:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.IntSwitch,int):1027:1029 -> j
+    23:25:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1012 -> j
+    23:25:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):858 -> j
+    26:34:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1013:1021 -> j
+    26:34:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):858 -> j
+    35:35:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):860:860 -> j
     36:36:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> j
-    36:36:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):880 -> j
+    36:36:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):864 -> j
     37:37:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> j
-    37:37:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):881 -> j
-    38:57:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):882:901 -> j
-    58:58:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> j
-    58:58:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):902 -> j
-    59:59:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> j
-    59:59:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):903 -> j
-    60:60:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> j
-    60:60:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):904 -> j
-    61:84:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):905:928 -> j
-    85:85:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
-    85:85:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):928 -> j
-    86:100:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):929:943 -> j
-    101:101:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
-    101:101:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):943 -> j
-    102:138:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):945:981 -> j
-    139:139:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
-    139:139:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):981 -> j
-    140:140:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):983:983 -> j
-    141:155:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):767:781 -> j
-    141:155:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):984 -> j
-    156:156:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> j
-    156:156:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):781 -> j
-    156:156:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):984 -> j
-    157:168:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):787:798 -> j
-    157:168:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):984 -> j
-    169:169:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
-    169:169:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):798 -> j
-    169:169:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):984 -> j
-    170:219:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):799:848 -> j
-    170:219:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):984 -> j
-    220:220:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> j
-    220:220:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):849 -> j
-    220:220:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):984 -> j
-    221:221:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):854:854 -> j
-    221:221:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):984 -> j
-    222:246:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):988:1012 -> j
-    1:3:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):255:257 -> k
+    37:37:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):865 -> j
+    38:56:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):866:884 -> j
+    57:57:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> j
+    57:57:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):884 -> j
+    58:58:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):885:885 -> j
+    59:59:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> j
+    59:59:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):886 -> j
+    60:60:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> j
+    60:60:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):887 -> j
+    61:61:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> j
+    61:61:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):888 -> j
+    62:85:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):889:912 -> j
+    86:86:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
+    86:86:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):912 -> j
+    87:101:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):913:927 -> j
+    102:102:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
+    102:102:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):927 -> j
+    103:139:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):929:965 -> j
+    140:140:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
+    140:140:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):965 -> j
+    141:141:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):967:967 -> j
+    142:156:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):751:765 -> j
+    142:156:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    157:157:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> j
+    157:157:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):765 -> j
+    157:157:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    158:169:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):771:782 -> j
+    158:169:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    170:170:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
+    170:170:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):782 -> j
+    170:170:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    171:220:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):783:832 -> j
+    171:220:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    221:221:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> j
+    221:221:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):833 -> j
+    221:221:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    222:222:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):838:838 -> j
+    222:222:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    223:247:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):972:996 -> j
+    1:3:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):239:241 -> k
     4:4:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> k
-    4:4:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):258 -> k
-    5:10:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):261:266 -> k
+    4:4:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):242 -> k
+    5:10:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):245:250 -> k
     11:11:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> k
-    11:11:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):267 -> k
-    12:19:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):271:278 -> k
+    11:11:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):251 -> k
+    12:19:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):255:262 -> k
     20:20:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> k
-    20:20:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):279 -> k
-    21:35:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):282:296 -> k
+    20:20:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):263 -> k
+    21:35:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):266:280 -> k
     36:36:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> k
-    36:36:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):297 -> k
-    37:37:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):298:298 -> k
+    36:36:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):281 -> k
+    37:37:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):282:282 -> k
     38:38:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> k
-    38:38:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):299 -> k
-    39:39:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):300:300 -> k
+    38:38:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):283 -> k
+    39:39:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):284:284 -> k
     40:40:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> k
-    40:40:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):302 -> k
+    40:40:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):286 -> k
     41:41:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> k
-    41:41:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):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):3926:3930 -> l
+    41:41:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):287 -> k
+    42:42:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):296:296 -> k
+    1:5:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3297:3301 -> l
     6:6:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> l
-    6:6:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):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):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):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):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
+    6:6:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3302 -> l
+    7:17:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3303:3313 -> l
+    18:18:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> l
+    18:18:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3320 -> l
+    19:20:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3321:3322 -> l
+    21:21:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> l
+    21:21:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3323 -> l
+    22:22:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> l
+    22:22:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3324 -> l
+    23:23:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> l
+    23:23:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3327 -> l
+    24:32:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3328:3336 -> l
+    1:55:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1724:1778 -> m
     56:56:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> m
-    56:56:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2407 -> m
+    56:56:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1778 -> m
     57:57:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> m
-    57:57:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2408 -> m
-    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():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
+    57:57:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1779 -> m
+    58:60:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1780:1782 -> m
+    61:87:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1767:1793 -> m
+    1:1:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2023:2023 -> n
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> n
+    2:2:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2023 -> n
+    3:9:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2026:2032 -> n
     10:10:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> n
-    10:10:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2662 -> n
-    11:11:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2663:2663 -> n
-    12:28:boolean allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):2628:2644 -> n
-    12:28:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2664 -> n
-    29:45:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2667:2683 -> n
-    46:63:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2682:2699 -> n
-    64:80:short[] computeArrayFilledData(com.android.tools.r8.ir.code.ConstInstruction[],int,int):2548:2564 -> n
-    64:80:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2700 -> n
-    81:87:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2704:2710 -> n
+    10:10:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2033 -> n
+    11:11:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2034:2034 -> n
+    12:28:boolean allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):1999:2015 -> n
+    12:28:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2035 -> n
+    29:45:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2038:2054 -> n
+    46:63:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2053:2070 -> n
+    64:80:short[] computeArrayFilledData(com.android.tools.r8.ir.code.ConstInstruction[],int,int):1919:1935 -> n
+    64:80:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2071 -> n
+    81:87:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2075:2081 -> n
     88:88:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> n
-    88:88:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2711 -> n
-    89:99:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2712:2722 -> n
+    88:88:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2082 -> n
+    89:99:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2083:2093 -> n
     100:100:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> n
-    100:100:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2723 -> n
-    101:115:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2724:2738 -> n
+    100:100:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2094 -> n
+    101:115:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2095:2109 -> n
     116:116:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> n
-    116:116:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2739 -> n
-    117:122:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2745:2750 -> n
-    1:6:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2787:2792 -> o
-    7:9:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2831:2833 -> o
-    7:9:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2792 -> o
+    116:116:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2110 -> n
+    117:122:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2116:2121 -> n
+    1:6:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2158:2163 -> o
+    7:9:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2202:2204 -> o
+    7:9:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2163 -> o
     10:10:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> o
-    10:10:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2834 -> o
-    10:10:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2792 -> o
-    11:25:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2835:2849 -> o
-    11:25:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2792 -> o
-    26:28:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2797:2799 -> o
+    10:10:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2205 -> o
+    10:10:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2163 -> o
+    11:25:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2206:2220 -> o
+    11:25:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2163 -> o
+    26:28:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2168:2170 -> o
     29:29:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> o
-    29:29:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2800 -> o
-    30:36:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2801:2807 -> o
-    37:59:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2756:2778 -> o
-    37:59:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2809 -> o
-    60:73:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2810:2823 -> o
-    74:74:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2783:2783 -> o
-    74:74:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2809 -> o
-    1:6:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3011:3016 -> p
-    7:23:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3619:3635 -> p
-    7:23:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3017 -> p
-    24:35:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3593:3604 -> p
-    24:35:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3018 -> p
+    29:29:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2171 -> o
+    30:36:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2172:2178 -> o
+    37:59:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2127:2149 -> o
+    37:59:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2180 -> o
+    60:73:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2181:2194 -> o
+    74:74:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2154:2154 -> o
+    74:74:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2180 -> o
+    1:6:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2382:2387 -> p
+    7:23:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2990:3006 -> p
+    7:23:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2388 -> p
+    24:35:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2964:2975 -> p
+    24:35:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
     36:49:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():27:40 -> p
-    36:49:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3604 -> p
-    36:49:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3018 -> p
+    36:49:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    36:49:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
     50:50:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():38:38 -> p
-    50:50:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3604 -> p
-    50:50:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3018 -> p
+    50:50:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    50:50:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
     51:51:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():36:36 -> p
-    51:51:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3604 -> p
-    51:51:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3018 -> p
+    51:51:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    51:51:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
     52:52:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():34:34 -> p
-    52:52:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3604 -> p
-    52:52:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3018 -> p
+    52:52:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    52:52:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
     53:53:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():32:32 -> p
-    53:53:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3604 -> p
-    53:53:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3018 -> p
-    54:62:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3604:3612 -> p
-    54:62:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3018 -> p
-    63:65:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3478:3480 -> p
-    63:65:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3020 -> p
-    66:66:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1009:1009 -> p
-    66:66:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3480 -> p
-    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():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
-    103:124:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3020 -> p
-    125:149:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3025:3049 -> p
-    150:150:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):3143:3143 -> p
-    150:150:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3050 -> p
-    151:165:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3053:3067 -> p
-    166:166:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):3143:3143 -> p
-    166:166:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3068 -> p
-    167:167:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3059:3059 -> p
-    168:168:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):3143:3143 -> p
-    168:168:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3060 -> p
-    169:179:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3075:3085 -> p
-    180:180:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):3143:3143 -> p
-    180:180:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3086 -> p
-    181:196:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3089:3104 -> p
-    197:197:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):3143:3143 -> p
-    197:197:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3105 -> p
-    198:198:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3095:3095 -> p
-    199:199:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):3143:3143 -> p
-    199:199:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3096 -> p
-    200:203:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3115:3118 -> p
-    204:204:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):3143:3143 -> p
-    204:204:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3119 -> p
-    205:205:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3121:3121 -> p
+    53:53:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    53:53:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    54:62:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975:2983 -> p
+    54:62:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    63:65:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2849:2851 -> p
+    63:65:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    66:66:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> p
+    66:66:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2851 -> p
+    66:66:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    67:101:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2852:2886 -> p
+    67:101:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    102:102:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> p
+    102:102:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2887 -> p
+    102:102:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    103:124:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2889:2910 -> p
+    103:124:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    125:149:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2396:2420 -> p
+    150:150:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    150:150:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2421 -> p
+    151:165:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2424:2438 -> p
+    166:166:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    166:166:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2439 -> p
+    167:167:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2430:2430 -> p
+    168:168:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    168:168:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2431 -> p
+    169:179:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2446:2456 -> p
+    180:180:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    180:180:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2457 -> p
+    181:196:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2460:2475 -> p
+    197:197:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    197:197:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2476 -> p
+    198:198:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2466:2466 -> p
+    199:199:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    199:199:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2467 -> p
+    200:203:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2486:2489 -> p
+    204:204:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    204:204:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2490 -> p
+    205:205:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2492:2492 -> p
     206:206:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> p
-    206:206:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3121 -> p
-    207:207:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):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
+    206:206:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2492 -> p
+    207:207:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    207:207:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2493 -> p
+    208:210:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2499:2501 -> p
     211:211:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> p
-    211:211:void simplifyIf(com.android.tools.r8.ir.code.IRCode):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
+    211:211:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2501 -> p
+    212:214:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2501:2503 -> p
+    1:3:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1580:1582 -> q
     4:4:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> q
-    4:4:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):2212 -> q
-    5:6:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):2213:2214 -> q
+    4:4:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1583 -> q
+    5:6:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1584:1585 -> q
     7:7:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> q
-    7:7:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):2215 -> q
-    8:16:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):2216:2224 -> q
+    7:7:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1586 -> q
+    8:16:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1587:1595 -> q
     17:17:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> q
-    17:17:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):2225 -> q
-    18:23:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):2226:2231 -> q
+    17:17:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1596 -> q
+    18:23:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1597:1602 -> q
     24:24:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> q
-    24:24:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):2234 -> q
-    25:25:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):2238:2238 -> q
-    1:3:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2249:2251 -> r
+    24:24:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1605 -> q
+    25:25:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1609:1609 -> q
+    1:3:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1620:1622 -> r
     4:4:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> r
-    4:4:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2252 -> r
-    5:23:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2253:2271 -> r
+    4:4:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1623 -> r
+    5:23:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1624:1642 -> r
     24:24:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> r
-    24:24:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2272 -> r
+    24:24:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1643 -> r
     25:25:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> r
-    25:25:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2273 -> r
+    25:25:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1644 -> r
     26:26:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> r
-    26:26:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):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):4252:4286 -> s
+    26:26:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1645 -> r
+    27:45:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1633:1651 -> r
+    1:35:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3623:3657 -> s
     36:36:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> s
-    36:36:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):4286 -> s
+    36:36:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3657 -> s
     37:37:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> s
-    37:37:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):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
-    35:35:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1134:1134 -> t
-    36:49:void collapseNonFallthroughSwitchTargets(com.android.tools.r8.ir.code.BasicBlock):395:408 -> t
-    36:49:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1135 -> t
-    50:50:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):430:430 -> t
-    50:50:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1139 -> t
-    51:58:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1141:1148 -> t
-    59:59:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):430:430 -> t
-    59:59:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1152 -> t
-    60:61:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1154:1155 -> t
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):3280:3280 -> u
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$12(com.android.tools.r8.ir.code.IRCode):3175 -> u
+    37:37:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3658 -> s
+    38:45:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3661:3668 -> s
+    1:15:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1101:1115 -> t
+    16:34:void collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):355:373 -> t
+    16:34:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1116 -> t
+    35:35:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1118:1118 -> t
+    36:49:void collapseNonFallthroughSwitchTargets(com.android.tools.r8.ir.code.BasicBlock):379:392 -> t
+    36:49:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1119 -> t
+    50:50:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):475:475 -> t
+    50:50:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1123 -> t
+    51:58:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1125:1132 -> t
+    59:59:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):475:475 -> t
+    59:59:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1136 -> t
+    60:61:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1138:1139 -> t
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2651:2651 -> u
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2546 -> u
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.<init>():119:119 -> u
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):3280 -> u
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$12(com.android.tools.r8.ir.code.IRCode):3175 -> u
-    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):3283:3296 -> u
-    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$12(com.android.tools.r8.ir.code.IRCode):3175 -> u
-    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$13(com.android.tools.r8.ir.code.IRCode):3176:3176 -> v
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2651 -> u
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2546 -> u
+    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2654:2667 -> u
+    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2546 -> u
+    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$11(com.android.tools.r8.ir.code.IRCode):2547:2547 -> v
     2:2:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> v
-    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$13(com.android.tools.r8.ir.code.IRCode):3176 -> v
-    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$6(com.android.tools.r8.ir.code.IRCode):2354:2354 -> w
+    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$11(com.android.tools.r8.ir.code.IRCode):2547 -> v
+    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.IRCode):1725:1725 -> w
     2:2:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> w
-    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$6(com.android.tools.r8.ir.code.IRCode):2354 -> w
-    1:13:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):232:244 -> x
-    14:20:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):241:247 -> x
+    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.IRCode):1725 -> w
+    1:13:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):216:228 -> x
+    14:20:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):225:231 -> x
 com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.D.e.i:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
-    1:1:void <clinit>():3053:3053 -> <clinit>
+    1:1:void <clinit>():2424:2424 -> <clinit>
 com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.D.e.j:
     com.android.tools.r8.utils.InternalOptions options -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():2853:2853 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.CodeRewriter$1):2853:2853 -> <init>
-    2:3:void <init>(com.android.tools.r8.utils.InternalOptions):2857:2858 -> <init>
-    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):2853:2853 -> a
-    2:2:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2866:2866 -> a
-    2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):2853 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1204:1204 -> a
-    3:3:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2866 -> a
-    3:3:boolean doEquivalent(java.lang.Object,java.lang.Object):2853 -> a
-    4:19:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2870:2885 -> a
-    4:19:boolean doEquivalent(java.lang.Object,java.lang.Object):2853 -> a
-    20:20:int doHash(java.lang.Object):2853:2853 -> a
-    21:35:int doHash(com.android.tools.r8.ir.code.Instruction):2896:2910 -> a
-    21:35:int doHash(java.lang.Object):2853 -> a
-    36:41:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2917:2922 -> a
-    42:46:int getHashCode(com.android.tools.r8.ir.code.Value):2928:2932 -> a
+    1:1:void <clinit>():2224:2224 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.CodeRewriter$1):2224:2224 -> <init>
+    2:3:void <init>(com.android.tools.r8.utils.InternalOptions):2228:2229 -> <init>
+    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):2224:2224 -> a
+    2:2:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2237:2237 -> a
+    2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):2224 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1206:1206 -> a
+    3:3:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2237 -> a
+    3:3:boolean doEquivalent(java.lang.Object,java.lang.Object):2224 -> a
+    4:19:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2241:2256 -> a
+    4:19:boolean doEquivalent(java.lang.Object,java.lang.Object):2224 -> a
+    20:20:int doHash(java.lang.Object):2224:2224 -> a
+    21:35:int doHash(com.android.tools.r8.ir.code.Instruction):2267:2281 -> a
+    21:35:int doHash(java.lang.Object):2224 -> a
+    36:41:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2288:2293 -> a
+    42:46:int getHashCode(com.android.tools.r8.ir.code.Value):2299:2303 -> a
 com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.D.e.k:
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> g
     com.android.tools.r8.ir.code.BasicBlock target -> f
@@ -35853,64 +35967,60 @@
     com.android.tools.r8.ir.code.IRCode code -> c
     boolean $assertionsDisabled -> h
     int right -> e
-    1:1:void <clinit>():525:525 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRCode):533:534 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setLeft(com.android.tools.r8.ir.code.Value):543:543 -> a
-    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):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
+    1:1:void <clinit>():509:509 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRCode):517:518 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setLeft(com.android.tools.r8.ir.code.Value):527:527 -> a
+    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setRight(int):532:532 -> a
+    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):542:542 -> a
+    4:9:com.android.tools.r8.ir.code.BasicBlock build():547:552 -> a
+    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    10:10:com.android.tools.r8.ir.code.BasicBlock build():552 -> a
+    11:16:com.android.tools.r8.ir.code.BasicBlock build():553:558 -> a
+    17:20:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata):1392:1395 -> a
+    17:20:com.android.tools.r8.ir.code.BasicBlock build():558 -> a
+    21:23:com.android.tools.r8.ir.code.BasicBlock build():560:562 -> a
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):537:537 -> b
 com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult -> com.android.tools.r8.D.e.l:
     com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult FALSE -> c
     com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult TRUE -> b
     com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult UNKNOWN -> a
-    1:3:void <clinit>():150:152 -> <clinit>
-    1:1:void <init>(java.lang.String,int):149:149 -> <init>
+    1:3:void <clinit>():134:136 -> <clinit>
+    1:1:void <init>(java.lang.String,int):133:133 -> <init>
 com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.D.e.m:
     com.android.tools.r8.ir.code.Position position -> b
     int blockNumber -> a
-    1:2:void <init>(com.android.tools.r8.ir.code.Position):453:454 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect -> com.android.tools.r8.D.e.n:
-    com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect NO_EFFECT -> d
-    com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect DESIRED_EFFECT -> a
-    com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect OTHER_EFFECT -> c
-    com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect CONDITIONAL_EFFECT -> b
-    1:4:void <clinit>():1542:1545 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1541:1541 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.D.e.o:
+    1:2:void <init>(com.android.tools.r8.ir.code.Position):437:438 -> <init>
+com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.D.e.n:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList keys -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():662:662 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):666:666 -> <init>
-    2:8:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):664:670 -> <init>
-    1:1:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):683:683 -> a
-    2:2:int getMax():679:679 -> a
-    2:2:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):683 -> a
-    3:3:int getMin():675:675 -> a
-    3:3:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):683 -> a
-    4:5:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):683:684 -> a
-    6:6:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode):700:700 -> a
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList access$000(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):662:662 -> b
-    2:2:int getMax():679:679 -> b
-    2:2:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):688 -> b
-    3:3:int getMin():675:675 -> b
-    3:3:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):688 -> b
-    4:4:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):689:689 -> b
+    1:1:void <clinit>():646:646 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):650:650 -> <init>
+    2:8:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):648:654 -> <init>
+    1:1:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):667:667 -> a
+    2:2:int getMax():663:663 -> a
+    2:2:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):667 -> a
+    3:3:int getMin():659:659 -> a
+    3:3:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):667 -> a
+    4:5:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):667:668 -> a
+    6:6:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode):684:684 -> a
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList access$000(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):646:646 -> b
+    2:2:int getMax():663:663 -> b
+    2:2:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):672 -> b
+    3:3:int getMin():659:659 -> b
+    3:3:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):672 -> b
+    4:4:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):673:673 -> b
     5:5:int com.android.tools.r8.ir.code.IntSwitch.baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):114:114 -> b
-    5:5:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):693 -> b
-    6:6:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):693:693 -> b
+    5:5:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):677 -> b
+    6:6:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):677:677 -> b
     7:7:int com.android.tools.r8.ir.code.IntSwitch.basePackedSize(com.android.tools.r8.utils.InternalOutputMode):103:103 -> b
-    7:7:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):695 -> b
-    8:8:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):695:695 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult -> com.android.tools.r8.D.e.p:
+    7:7:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):679 -> b
+    8:8:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):679:679 -> b
+com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult -> com.android.tools.r8.D.e.o:
     com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult NO_REMOVALS -> a
     com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult REMOVED_CAST_DO_NARROW -> b
-    1:2:void <clinit>():1973:1974 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1972:1972 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$SCC -> com.android.tools.r8.D.e.q:
+    1:2:void <clinit>():1349:1350 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1348:1348 -> <init>
+com.android.tools.r8.ir.optimize.CodeRewriter$SCC -> com.android.tools.r8.D.e.p:
     java.util.Deque unassignedStack -> d
     java.util.Set unassignedSet -> c
     java.util.List components -> f
@@ -35918,27 +36028,27 @@
     java.util.Deque preorderStack -> e
     boolean $assertionsDisabled -> g
     int currentTime -> a
-    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:
+    1:1:void <clinit>():3568:3568 -> <clinit>
+    1:8:void <init>():3568:3575 -> <init>
+    9:9:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter$1):3568:3568 -> <init>
+    1:3:java.util.List computeSCC(com.android.tools.r8.ir.code.Value):3578:3580 -> a
+    1:33:void dfs(com.android.tools.r8.ir.code.Value):3584:3616 -> b
+com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.D.e.q:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap keyToTarget -> d
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> e
     com.android.tools.r8.ir.code.Value value -> c
-    1:1:void <init>(com.android.tools.r8.ir.code.Position):471:471 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.Position):467:467 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setValue(com.android.tools.r8.ir.code.Value):480:480 -> a
-    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):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
-    1:1:java.lang.Integer lambda$build$1(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):514:514 -> b
-com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.D.e.u:
+    1:1:void <init>(com.android.tools.r8.ir.code.Position):455:455 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.Position):451:451 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setValue(com.android.tools.r8.ir.code.Value):464:464 -> a
+    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder addKeyAndTarget(int,com.android.tools.r8.ir.code.BasicBlock):469:469 -> a
+    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):474:474 -> a
+    4:25:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):480:501 -> a
+    26:29:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createSwitchBlock(int,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.IRMetadata):1422:1425 -> a
+    26:29:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):501 -> a
+    30:31:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):502:503 -> a
+    32:32:java.lang.Integer lambda$build$0(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):492:492 -> a
+    1:1:java.lang.Integer lambda$build$1(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):498:498 -> b
+com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.D.e.t:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap histogramOfCanonicalizationCandidatesPerMethod -> e
     boolean $assertionsDisabled -> f
     int numberOfConstClassCanonicalization -> d
@@ -35985,7 +36095,7 @@
     178:178:com.android.tools.r8.ir.code.ConstInstruction com.android.tools.r8.ir.code.ConstInstruction.asConstInstruction():0:0 -> a
     178:178:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):165 -> a
     1:1:boolean lambda$canonicalize$3(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):161:161 -> b
-com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> com.android.tools.r8.D.e.t:
+com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> com.android.tools.r8.D.e.s:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():71:71 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.ConstantCanonicalizer):71:71 -> <init>
@@ -35997,7 +36107,7 @@
     7:10:int hashCode(java.lang.Object):71 -> a
     11:25:int hashCode(com.android.tools.r8.ir.code.ConstInstruction):74:88 -> a
     11:25:int hashCode(java.lang.Object):71 -> a
-com.android.tools.r8.ir.optimize.DeadCodeRemover -> com.android.tools.r8.D.e.v:
+com.android.tools.r8.ir.optimize.DeadCodeRemover -> com.android.tools.r8.D.e.u:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> b
     boolean $assertionsDisabled -> c
@@ -36024,7 +36134,7 @@
     5:39:java.util.Collection getDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):149:183 -> b
     5:39:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):121 -> b
     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.ir.optimize.DefaultInliningOracle -> com.android.tools.r8.D.e.v:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.IRCode code -> d
@@ -36034,89 +36144,119 @@
     com.android.tools.r8.graph.DexEncodedMethod method -> c
     com.android.tools.r8.ir.conversion.CallSiteInformation callSiteInformation -> e
     java.util.function.Predicate isProcessedConcurrently -> f
-    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>
+    1:1:void <clinit>():50:50 -> <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):69:77 -> <init>
     com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod) -> 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):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:
+    1:29:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):94:122 -> a
+    1:29:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):351 -> a
+    30:30:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):355:355 -> a
+    31:49:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):130:148 -> a
+    31:49:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
+    50:51:boolean isDoubleInliningTarget(com.android.tools.r8.graph.DexEncodedMethod):210:211 -> a
+    50:51:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):150 -> a
+    50:51:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
+    52:54:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):151:153 -> a
+    52:54:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
+    55:55:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    55:55:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):137 -> a
+    55:55:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
+    56:56:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    56:56:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):132 -> a
+    56:56:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
+    57:58:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):133:134 -> a
+    57:58:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
+    59:60:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):360:361 -> a
+    61:61:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):360:360 -> a
+    62:70:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):219:227 -> a
+    62:70:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365 -> a
+    71:71:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    71:71:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):227 -> a
+    71:71:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365 -> a
+    72:143:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):227:298 -> a
+    72:143:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365 -> a
+    144:146:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):297:299 -> a
+    144:146:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365 -> a
+    147:147:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):369:369 -> a
+    148:150:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):95:97 -> a
+    148:150:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):351 -> a
+    151:166:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):169:184 -> a
+    167:187:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):180:200 -> a
+    188:188:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
+    188:188:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):200 -> a
+    189:189:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):204:204 -> a
+    190:190:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
+    190:190:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):200 -> a
+    191:191:java.lang.Boolean lambda$canInlineStaticInvoke$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):182:182 -> a
+    192:192:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):311:311 -> a
+    193:204:int computeInstructionLimit(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):320:331 -> a
+    193:204:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):312 -> a
+    205:205:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):313:313 -> a
+    206:206:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):342:342 -> a
+    207:208:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):378:379 -> a
+    209:209:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    209:209:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):379 -> a
+    210:215:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):381:386 -> a
+    216:216:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
+    216:216:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):386 -> a
+    217:217:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):387:387 -> a
+    218:218:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    218:218:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):387 -> a
+    219:230:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):387:398 -> a
+    231:235:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):411:415 -> a
+    236:238:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):421:423 -> a
+    239:239:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    239:239:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):423 -> a
+    240:240:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):425:425 -> a
+    241:272:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):443:474 -> a
+    273:273:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    273:273:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):474 -> a
+    274:279:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):477:482 -> a
+    280:280:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    280:280:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):474 -> a
+    281:299:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):485:503 -> a
+    300:300:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    300:300:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):504 -> a
+    301:302:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):506:507 -> a
+    303:303:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    303:303:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):504 -> a
+    304:312:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):513:521 -> a
+    313:313:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    313:313:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):522 -> a
+    314:316:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):524:526 -> a
+    317:317:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    317:317:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):522 -> a
+    318:318:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):534:534 -> a
+    319:319:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):541:541 -> a
+    320:320:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():561:561 -> a
+    320:320:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):541 -> a
+    321:323:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):544:546 -> a
+    324:324:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():561:561 -> a
+    324:324:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):541 -> a
+    325:325:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):558:558 -> a
+    326:326:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():561:561 -> a
+    326:326:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):558 -> a
+    327:329:boolean willExceedInstructionBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):569:571 -> a
+    327:329:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):561 -> a
+    330:330:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):562:562 -> a
+    331:347:boolean willExceedControlFlowResolutionBlocksBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):656:672 -> a
+    331:347:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):563 -> a
+    348:348:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():561:561 -> a
+    348:348:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):558 -> a
+    349:365:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):591:607 -> a
+    366:366:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    366:366:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):607 -> a
+    367:371:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):608:612 -> a
+    372:372:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    372:372:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):613 -> a
+    373:373:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):615:615 -> a
+    374:374:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    374:374:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):607 -> a
+    375:378:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):620:623 -> a
+    379:379:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):682:682 -> a
+    380:404:void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):688:712 -> a
+    405:412:void insertAssumeInstructionsToInlinee(com.android.tools.r8.ir.optimize.Assumer,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator,java.util.Set):724:731 -> a
+com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.D.e.w:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():37:37 -> <clinit>
@@ -36132,7 +36272,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):959:959 -> a
+    125:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     125:125:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):174 -> a
     126:145:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):176:195 -> a
     146:146:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
@@ -36150,7 +36290,7 @@
     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:
+com.android.tools.r8.ir.optimize.DynamicTypeOptimization -> com.android.tools.r8.D.e.x:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():31:31 -> <clinit>
@@ -36178,7 +36318,7 @@
     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:
+com.android.tools.r8.ir.optimize.EnumInfoMapCollector -> com.android.tools.r8.D.e.y:
     java.util.Map valueInfoMaps -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):35:35 -> <init>
@@ -36187,26 +36327,25 @@
     2:44:void processClasses(com.android.tools.r8.graph.DexProgramClass):51:93 -> a
     2:44:com.android.tools.r8.shaking.AppInfoWithLiveness run():41 -> a
     45:48:com.android.tools.r8.shaking.AppInfoWithLiveness run():43:46 -> a
-com.android.tools.r8.ir.optimize.ForcedInliningOracle -> com.android.tools.r8.D.e.A:
+com.android.tools.r8.ir.optimize.ForcedInliningOracle -> com.android.tools.r8.D.e.z:
     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>
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):32:35 -> <init>
     boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback) -> a
     boolean isForcedInliningOracle() -> a
     void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason) -> a
     boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     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,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:
+    boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
+    1:5:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):45:49 -> a
+    6:16:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvoke(com.android.tools.r8.ir.code.InvokeMethod):62:72 -> a
+    6:16:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):58 -> a
+    17:20:com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod):113:116 -> a
+com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.D.e.B:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap histogramOfCanonicalizationCandidatesPerMethod -> e
@@ -36228,12 +36367,12 @@
     34:40:boolean isIdempotentLibraryMethodInvoke(com.android.tools.r8.ir.code.InvokeMethod):256:262 -> a
     34:40:void canonicalize(com.android.tools.r8.ir.code.IRCode):130 -> a
     41:61:void canonicalize(com.android.tools.r8.ir.code.IRCode):131:151 -> a
-    62:62:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    62:62:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     62:62:void canonicalize(com.android.tools.r8.ir.code.IRCode):151 -> a
     63:63:void canonicalize(com.android.tools.r8.ir.code.IRCode):152:152 -> a
     64:64:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
     64:64:void canonicalize(com.android.tools.r8.ir.code.IRCode):152 -> a
-    65:65:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    65:65:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     65:65:void canonicalize(com.android.tools.r8.ir.code.IRCode):151 -> a
     66:66:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
     66:66:void canonicalize(com.android.tools.r8.ir.code.IRCode):138 -> a
@@ -36273,7 +36412,7 @@
     210:210:void insertCanonicalizedInvokeWithInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):285 -> a
     211:211:boolean lambda$insertCanonicalizedInvokeWithInValues$6(com.android.tools.r8.ir.code.Instruction):280:280 -> a
     1:1:boolean lambda$canonicalize$3(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):195:195 -> b
-com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer$1 -> com.android.tools.r8.D.e.B:
+com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer$1 -> com.android.tools.r8.D.e.A:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():97:97 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer):97:97 -> <init>
@@ -36283,71 +36422,73 @@
     7:7:int hashCode(java.lang.Object):97:97 -> a
     8:8:int hashCode(com.android.tools.r8.ir.code.InvokeMethod):100:100 -> a
     8:8:int hashCode(java.lang.Object):97 -> a
-com.android.tools.r8.ir.optimize.Inliner -> com.android.tools.r8.D.e.J:
+com.android.tools.r8.ir.optimize.Inliner -> com.android.tools.r8.D.e.I:
     java.util.Set doubleInlineSelectedTargets -> g
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> c
     java.util.Set doubleInlineCallers -> f
     boolean applyDoubleInlining -> e
-    java.util.Set blackList -> b
+    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):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:
+    1:1:void <clinit>():69:69 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.ir.conversion.LensCodeRewriter):85:85 -> <init>
+    2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.ir.conversion.LensCodeRewriter):77:90 -> <init>
+    1:19:boolean isBlacklisted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):95:113 -> a
+    20:20:boolean isBlacklisted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):108:108 -> a
+    21:21:boolean isDoubleInliningEnabled():121:121 -> a
+    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):135:135 -> a
+    23:23:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    23:23:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1425 -> a
+    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):135 -> a
+    24:24:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1425:1425 -> a
+    24:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):135 -> a
+    25:30:boolean useReflectiveOperationExceptionOrUnknownClassInCatch(com.android.tools.r8.ir.code.IRCode):991:996 -> a
+    25:30:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):136 -> a
+    31:43:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):137:149 -> a
+    44:46:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):127:129 -> a
+    44:46:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):150 -> a
+    47:52:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):151:156 -> a
+    53:58:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):178:183 -> a
+    59:69:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):187:197 -> a
+    70:71:boolean isDoubleInliningTarget(com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.graph.DexEncodedMethod):202:203 -> a
+    72:79:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):238:245 -> a
+    80:93:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):244:257 -> a
+    94:98:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):247:251 -> a
+    99:105:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):247:253 -> a
+    106:130:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):773:797 -> a
+    131:132:void performForcedInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map):822:823 -> a
+    133:141:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):832:840 -> a
+    142:142:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):851:851 -> a
+    142:142:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):834 -> a
+    143:143:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):841:841 -> a
+    144:144:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):851:851 -> a
+    145:156:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):868:879 -> a
+    157:157:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    157:157:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):880 -> a
+    158:184:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):881:907 -> a
+    185:192:com.android.tools.r8.ir.code.Position getPositionForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):979:986 -> a
+    185:192:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):912 -> a
+    193:193:com.android.tools.r8.ir.code.Position getPositionForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):984:984 -> a
+    193:193:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):912 -> a
+    194:194:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):912:912 -> a
+    195:223:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):908:936 -> a
+    224:224:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    224:224:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):941 -> a
+    225:226:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):942:943 -> a
+    227:236:com.android.tools.r8.graph.DexType getDowncastTypeIfNeeded(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):1006:1015 -> a
+    227:236:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):949 -> a
+    237:266:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):943:972 -> a
+    267:267:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):475:475 -> a
+    267:267:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):973 -> a
+    268:269:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):974:975 -> a
+    1:7:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):162:168 -> b
+    8:8:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> b
+    8:8:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):168 -> b
+    9:20:void recordDoubleInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):220:231 -> b
+    1:7:boolean satisfiesRequirementsForDoubleInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):208:214 -> c
+com.android.tools.r8.ir.optimize.Inliner$Constraint -> com.android.tools.r8.D.e.C:
     com.android.tools.r8.ir.optimize.Inliner$Constraint PACKAGE -> e
     com.android.tools.r8.ir.optimize.Inliner$Constraint SAMENEST -> d
     com.android.tools.r8.ir.optimize.Inliner$Constraint[] $VALUES -> h
@@ -36357,62 +36498,107 @@
     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>():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:
+    1:17:void <clinit>():267:283 -> <clinit>
+    18:47:void <clinit>():267:296 -> <clinit>
+    1:2:void <init>(java.lang.String,int,int):287:288 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.Inliner$Constraint[] values():267:267 -> a
+    1:1:boolean isSet(int):300:300 -> b
+com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget -> com.android.tools.r8.D.e.D:
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget ALWAYS -> d
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget NEVER -> c
     com.android.tools.r8.ir.optimize.Inliner$Constraint constraint -> a
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType targetHolder -> b
-    1:9:void <clinit>():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
+    1:9:void <clinit>():318:326 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):328:331 -> <init>
+    5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):334:338 -> <init>
+    1:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):361:384 -> a
+    25:36:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):390:401 -> a
+    37:87:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):406:456 -> a
+    88:98:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):530:540 -> a
+    88:98:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):456 -> a
+    99:106:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):457:464 -> a
+    107:122:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):507:522 -> a
+    107:122:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):464 -> a
+    123:157:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):468:502 -> a
+    1:5:boolean equals(java.lang.Object):351:355 -> equals
+    1:4:int hashCode():343:346 -> hashCode
     5:5:int com.android.tools.r8.graph.DexType.computeHashCode():43:43 -> hashCode
-    5:5:int hashCode():335 -> hashCode
-com.android.tools.r8.ir.optimize.Inliner$InlineAction -> com.android.tools.r8.D.e.F:
+    5:5:int hashCode():346 -> hashCode
+com.android.tools.r8.ir.optimize.Inliner$InlineAction -> com.android.tools.r8.D.e.E:
     com.android.tools.r8.graph.DexEncodedMethod target -> a
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> b
     boolean shouldSynthesizeNullCheckForReceiver -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():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):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:
+    1:1:void <clinit>():565:565 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):573:576 -> <init>
+    1:1:void setShouldSynthesizeNullCheckForReceiver():580:580 -> a
+    2:17:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):589:604 -> a
+    18:18:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    18:18:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):604 -> a
+    19:50:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):605:636 -> a
+    51:51:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    51:51:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):637 -> a
+    52:62:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):638:648 -> a
+    63:63:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    63:63:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):647 -> a
+    64:85:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):650:671 -> a
+    86:91:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):670:675 -> a
+    92:92:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    92:92:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):677 -> a
+    93:93:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):677:677 -> a
+    94:94:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    94:94:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):675 -> a
+    95:103:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):678:686 -> a
+    104:104:com.android.tools.r8.ir.code.Phi com.android.tools.r8.ir.code.IRCode.createPhi(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1036:1036 -> a
+    104:104:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):688 -> a
+    105:106:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):689:690 -> a
+    107:107:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):130:130 -> a
+    107:107:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):692 -> a
+    108:110:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):696:698 -> a
+    111:111:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    111:111:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):698 -> a
+    112:124:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):699:711 -> a
+    125:125:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    125:125:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):711 -> a
+    126:139:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):712:725 -> a
+    140:140:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    140:140:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):724 -> a
+    141:141:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    141:141:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):723 -> a
+    142:142:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):726:726 -> a
+    143:143:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    143:143:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):726 -> a
+    144:148:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):728:732 -> a
+    149:149:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    149:149:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):732 -> a
+    150:150:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    150:150:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):733 -> a
+    151:151:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):734:734 -> a
+    152:152:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    152:152:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):734 -> a
+    153:165:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):735:747 -> a
+    166:166:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    166:166:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):747 -> a
+    167:171:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):752:756 -> a
+    172:172:com.android.tools.r8.ir.code.Value lambda$buildInliningIR$0(com.android.tools.r8.ir.code.BasicBlock):691:691 -> a
+com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason -> com.android.tools.r8.D.e.F:
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> a
     com.android.tools.r8.ir.code.IRCode code -> b
-    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner$Reason):632:634 -> <init>
-com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.D.e.H:
+    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner$Reason):765:767 -> <init>
+com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.D.e.G:
     com.android.tools.r8.graph.DexEncodedMethod target -> a
     com.android.tools.r8.graph.DexType receiverType -> b
-    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):678:680 -> <init>
-com.android.tools.r8.ir.optimize.Inliner$Reason -> com.android.tools.r8.D.e.I:
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):811:813 -> <init>
+com.android.tools.r8.ir.optimize.Inliner$Reason -> com.android.tools.r8.D.e.H:
     com.android.tools.r8.ir.optimize.Inliner$Reason SIMPLE -> e
     com.android.tools.r8.ir.optimize.Inliner$Reason SINGLE_CALLER -> c
     com.android.tools.r8.ir.optimize.Inliner$Reason DUAL_CALLER -> d
     com.android.tools.r8.ir.optimize.Inliner$Reason FORCE -> a
     com.android.tools.r8.ir.optimize.Inliner$Reason ALWAYS -> b
-    1:5:void <clinit>():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:
+    1:5:void <clinit>():553:557 -> <clinit>
+    1:1:void <init>(java.lang.String,int):552:552 -> <init>
+com.android.tools.r8.ir.optimize.InliningConstraints -> com.android.tools.r8.D.e.J:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.GraphLense graphLense -> c
     boolean allowStaticInterfaceMethodCalls -> b
@@ -36446,10 +36632,13 @@
     39:41:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):158:160 -> a
     42:42:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):159:159 -> a
     43:43:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):191:191 -> a
-    44:60:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):286:302 -> a
-    61:74:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):300:313 -> a
-    75:98:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):318:341 -> a
-    99:148:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):348:397 -> a
+    44:60:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):285:301 -> a
+    61:74:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):299:312 -> a
+    75:98:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):317:340 -> a
+    99:140:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):347:388 -> a
+    141:141:java.util.Set com.android.tools.r8.graph.ResolutionResult.lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):33:33 -> a
+    141:141:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):388 -> a
+    142:149:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):389:396 -> a
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):88:88 -> b
     2:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstancePut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):126:128 -> b
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstancePut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):127:127 -> b
@@ -36457,29 +36646,28 @@
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):122:122 -> c
     2:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):184:186 -> c
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):185:185 -> c
-    6:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):248:250 -> c
-    9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):249:249 -> c
+    6:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):247:249 -> c
+    9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):248:248 -> c
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeMultiNewArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):172:172 -> d
     2:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):195:196 -> d
-    4:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticPut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):254:256 -> d
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticPut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):255:255 -> d
+    4:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticPut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):253:255 -> d
+    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticPut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):254:254 -> d
     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.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
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayEmpty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):223:223 -> f
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):231:231 -> g
+com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.D.e.K:
+    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     boolean isForcedInliningOracle() -> a
     com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType) -> a
-com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.D.e.M:
+com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.D.e.L:
     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
     void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason) -> a
     boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     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,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
-com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.D.e.N:
+    boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
+com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.D.e.M:
     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
@@ -36487,7 +36675,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.O:
+com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool -> com.android.tools.r8.D.e.N:
     java.util.Set interfaces -> c
     java.util.Set subTypes -> d
     java.util.Set memberPool -> e
@@ -36516,7 +36704,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.S:
+com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.D.e.Q:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set warnedFields -> c
@@ -36551,66 +36739,69 @@
     99:99:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):235 -> a
     100:100:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):237:237 -> a
     101:108:void rewriteStaticGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet):341:348 -> a
-    109:141:void rewriteStaticGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet):347:379 -> a
-    142:142:java.lang.Boolean lambda$rewriteStaticGetWithConstantValues$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):348:348 -> a
-    143:153:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):418:428 -> a
-    154:154:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    154:154:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):429 -> a
-    155:157:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):430:432 -> a
-    158:207:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):250:299 -> a
-    158:207:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    208:212:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedMethod):98:102 -> a
-    208:212:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):303 -> a
-    208:212:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    213:219:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):306:312 -> a
-    213:219:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    220:227:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):311:318 -> a
-    220:227:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    228:232:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):190:194 -> a
-    228:232:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):317 -> a
-    228:232:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    233:236:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):192:195 -> a
-    233:236:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):317 -> a
-    233:236:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    237:246:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):191:200 -> a
-    237:246:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):317 -> a
-    237:246:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    247:253:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):321:327 -> a
-    247:253:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    254:254:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    254:254:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):327 -> a
-    254:254:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    255:255:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    255:255:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):329 -> a
-    255:255:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    256:256:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):331:331 -> a
-    256:256:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    257:263:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):433:439 -> a
-    264:272:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):434:442 -> a
-    273:273: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:388 -> a
-    273:273:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):441 -> a
-    274:274:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    274:274: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 -> a
-    274:274:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):441 -> a
-    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):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.P:
+    109:144:void rewriteStaticGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet):347:382 -> a
+    145:145:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    145:145:void rewriteStaticGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet):382 -> a
+    146:154:void rewriteStaticGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet):384:392 -> a
+    155:155:java.lang.Boolean lambda$rewriteStaticGetWithConstantValues$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):348:348 -> a
+    156:166:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):432:442 -> a
+    167:167:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    167:167:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):443 -> a
+    168:170:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):444:446 -> a
+    171:220:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):250:299 -> a
+    171:220:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    221:225:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedMethod):98:102 -> a
+    221:225:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):303 -> a
+    221:225:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    226:232:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):306:312 -> a
+    226:232:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    233:240:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):311:318 -> a
+    233:240:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    241:245:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):190:194 -> a
+    241:245:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):317 -> a
+    241:245:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    246:249:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):192:195 -> a
+    246:249:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):317 -> a
+    246:249:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    250:259:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):191:200 -> a
+    250:259:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):317 -> a
+    250:259:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    260:266:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):321:327 -> a
+    260:266:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    267:267:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    267:267:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):327 -> a
+    267:267:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    268:268:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    268:268:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):329 -> a
+    268:268:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    269:269:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):331:331 -> a
+    269:269:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    270:276:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):447:453 -> a
+    277:285:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):448:456 -> a
+    286:286:void rewriteInstanceGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet):401:401 -> a
+    286:286:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):455 -> a
+    287:287:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
+    287:287:void rewriteInstanceGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet):401 -> a
+    287:287:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):455 -> a
+    288:305:void rewriteInstanceGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet):405:422 -> a
+    288:305:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):455 -> a
+    306:307:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):460:461 -> a
+    308:308:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    308:308:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):461 -> a
+    309:311:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):461:463 -> a
+com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup -> com.android.tools.r8.D.e.O:
     com.android.tools.r8.shaking.ProguardMemberRule rule -> b
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType type -> a
     1:3:void <init>(com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType,com.android.tools.r8.shaking.ProguardMemberRule):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.Q:
+com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType -> com.android.tools.r8.D.e.P:
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType ASSUME_VALUES -> c
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType NONE -> a
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType ASSUME_NO_SIDE_EFFECTS -> b
     1:3:void <clinit>():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.T:
+com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.D.e.S:
     java.util.Map com.android.tools.r8.ir.optimize.MemberPoolCollection.memberPools -> c
     com.android.tools.r8.graph.AppView com.android.tools.r8.ir.optimize.MemberPoolCollection.appView -> b
     com.android.tools.r8.com.google.common.base.Equivalence com.android.tools.r8.ir.optimize.MemberPoolCollection.equivalence -> a
@@ -36640,16 +36831,16 @@
     12:13:void com.android.tools.r8.ir.optimize.MemberPoolCollection.submitAll(java.lang.Iterable,java.util.List,java.util.concurrent.ExecutorService):98:99 -> a
     14:14:void com.android.tools.r8.ir.optimize.MemberPoolCollection.submit(com.android.tools.r8.graph.DexClass,java.util.List,java.util.concurrent.ExecutorService):104:104 -> a
     15:18:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):135:138 -> a
-    19:19:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):558:558 -> a
+    19:19:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> a
     19:19:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):139 -> a
     20:21:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):141:142 -> a
-    22:22:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):582:582 -> a
+    22:22:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):581:581 -> a
     22:22:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):143 -> a
     23:30:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):145:152 -> a
-    31:31:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):558:558 -> a
+    31:31:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> a
     31:31:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):153 -> a
     32:33:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):155:156 -> a
-    34:34:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):582:582 -> a
+    34:34:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):581:581 -> a
     34:34:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):157 -> a
     35:35:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$1(java.util.Deque,com.android.tools.r8.graph.DexType):140:140 -> a
     36:36:void com.android.tools.r8.ir.optimize.MemberPoolCollection.addNonNull(java.util.Collection,java.lang.Object):234:234 -> a
@@ -36685,7 +36876,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.U:
+com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.D.e.T:
     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>
@@ -36693,7 +36884,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.V:
+com.android.tools.r8.ir.optimize.NestReducer -> com.android.tools.r8.D.e.U:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():29:29 -> <clinit>
@@ -36727,75 +36918,71 @@
     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.W:
+com.android.tools.r8.ir.optimize.NestUtils -> com.android.tools.r8.D.e.V:
     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():879:879 -> a
+    15:15:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     15:15:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):46 -> a
     16:31:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):47:62 -> a
     32:36:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):61:65 -> a
     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.X:
+com.android.tools.r8.ir.optimize.NonNullTracker -> com.android.tools.r8.D.e.W:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.function.Consumer splitBlockConsumer -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():51:51 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):58:58 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Consumer):61:64 -> <init>
+    1:1:void <clinit>():47:47 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):54:54 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Consumer):57:60 -> <init>
     void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode) -> a
     boolean lambda$addNonNullForValues$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
-    1:15:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):70:84 -> a
+    1:15:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):66:80 -> a
     16:16:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    16:16:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):85 -> a
-    17:73:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):86:142 -> a
+    16:16:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):81 -> a
+    17:73:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):82:138 -> a
     74:74:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
-    74:74:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):142 -> a
-    75:78:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):143:146 -> a
-    79:87:boolean verifyCompanionClassInstanceIsKnownToBeNonNull(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,java.util.Set):257:265 -> a
-    79:87:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):146 -> a
+    74:74:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):138 -> a
+    75:78:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):139:142 -> a
+    79:87:boolean verifyCompanionClassInstanceIsKnownToBeNonNull(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,java.util.Set):253:261 -> a
+    79:87:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):142 -> a
     88:88:boolean com.android.tools.r8.graph.DexClass.initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView):784:784 -> a
-    88:88:boolean verifyCompanionClassInstanceIsKnownToBeNonNull(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,java.util.Set):266 -> a
-    88:88:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):146 -> a
-    89:97:boolean verifyCompanionClassInstanceIsKnownToBeNonNull(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,java.util.Set):267:275 -> a
-    89:97:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):146 -> a
+    88:88:boolean verifyCompanionClassInstanceIsKnownToBeNonNull(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,java.util.Set):262 -> a
+    88:88:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):142 -> a
+    89:97:boolean verifyCompanionClassInstanceIsKnownToBeNonNull(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,java.util.Set):263:271 -> a
+    89:97:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):142 -> a
     98:98:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    98:98:boolean verifyCompanionClassInstanceIsKnownToBeNonNull(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,java.util.Set):261 -> a
-    98:98:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):146 -> a
-    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:184:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):229:237 -> a
+    98:98:boolean verifyCompanionClassInstanceIsKnownToBeNonNull(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,java.util.Set):257 -> a
+    98:98:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):142 -> a
+    99:100:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):153:154 -> a
+    101:175:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):153:227 -> a
+    176:184:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):225:233 -> a
     185:185:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    185:185:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):237 -> a
-    186:186:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):237:237 -> a
+    185:185:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):233 -> a
+    186:186:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):233:233 -> a
     187:187:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
-    187:187:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):238 -> a
+    187:187:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):234 -> a
     188:188:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):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
+    188:188:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):235 -> a
+    189:198:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):236:245 -> a
     199:199:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    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
-    262:272:void addNonNullForValues(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.util.Set,java.util.Set):361:371 -> a
+    199:199:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):245 -> a
+    200:200:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):245:245 -> a
+    201:261:void addNonNullForValues(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.util.Set,java.util.Set):299:359 -> a
+    262:272:void addNonNullForValues(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.util.Set,java.util.Set):357:367 -> a
     273:273:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    273:273:void addNonNullForValues(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.util.Set,java.util.Set):371 -> a
-    274:279:void addNonNullForValues(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.util.Set,java.util.Set):374:379 -> a
-    280:285:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):387:392 -> a
+    273:273:void addNonNullForValues(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.util.Set,java.util.Set):367 -> a
+    274:279:void addNonNullForValues(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.util.Set,java.util.Set):370:375 -> a
+    280:285:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):383:388 -> a
     286:286:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
-    286:286:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):392 -> a
-    287:295:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):394:402 -> a
-    296:298:boolean isNullableReferenceTypeWithUsers(com.android.tools.r8.ir.code.Value):411:413 -> a
+    286:286:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):388 -> a
+    287:295:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):390:398 -> a
+    296:298:boolean isNullableReferenceTypeWithUsers(com.android.tools.r8.ir.code.Value):407:409 -> a
     299:299:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    299:299:boolean isNullableReferenceTypeWithUsers(com.android.tools.r8.ir.code.Value):413 -> a
-    300:300:boolean isNullableReferenceTypeWithUsers(com.android.tools.r8.ir.code.Value):414:414 -> a
-    301:332:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):418:449 -> a
-    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.k0:
+    299:299:boolean isNullableReferenceTypeWithUsers(com.android.tools.r8.ir.code.Value):409 -> a
+    300:300:boolean isNullableReferenceTypeWithUsers(com.android.tools.r8.ir.code.Value):410:410 -> a
+com.android.tools.r8.ir.optimize.Outliner -> com.android.tools.r8.D.e.j0:
     java.util.List candidateMethodLists -> a
     java.util.Map outlineSites -> c
     java.util.Map generatedOutlines -> d
@@ -36814,10 +37001,10 @@
     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:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     31:31:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1343 -> a
     32:40:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1344:1352 -> a
-    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     41:41:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1352 -> a
     42:64:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1353:1375 -> a
     65:65:void com.android.tools.r8.graph.DexProgramClass.<init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):70:70 -> a
@@ -36836,7 +37023,7 @@
     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.Y:
+com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction -> com.android.tools.r8.D.e.X:
     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
@@ -36864,7 +37051,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.Z:
+com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction -> com.android.tools.r8.D.e.Y:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> d
     com.android.tools.r8.graph.DexProto proto -> f
     boolean hasOutValue -> e
@@ -36900,7 +37087,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.a0:
+com.android.tools.r8.ir.optimize.Outliner$NewInstanceOutlineInstruction -> com.android.tools.r8.D.e.Z:
     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
@@ -36921,7 +37108,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.b0:
+com.android.tools.r8.ir.optimize.Outliner$Outline -> com.android.tools.r8.D.e.a0:
     java.util.List argumentMap -> b
     java.util.List argumentTypes -> a
     com.android.tools.r8.graph.DexProto proto -> e
@@ -36945,7 +37132,7 @@
     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$OutlineCode -> com.android.tools.r8.D.e.b0:
     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>
@@ -36960,7 +37147,7 @@
     int estimatedSizeForInlining() -> l
     boolean isOutlineCode() -> o
     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 -> com.android.tools.r8.D.e.d0:
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():122:122 -> <clinit>
@@ -36972,7 +37159,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.d0:
+com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType -> com.android.tools.r8.D.e.c0:
     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
@@ -36985,13 +37172,13 @@
     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.f0:
+com.android.tools.r8.ir.optimize.Outliner$OutlineMethodIdentifier -> com.android.tools.r8.D.e.e0:
     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):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:
+com.android.tools.r8.ir.optimize.Outliner$OutlineRewriter -> com.android.tools.r8.D.e.f0:
     java.util.ListIterator blocksIterator -> r
     java.util.List toRemove -> s
     com.android.tools.r8.ir.code.IRCode code -> q
@@ -37000,17 +37187,19 @@
     int argumentsMapIndex -> t
     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):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:
+    1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1200:1202 -> a
+    4:6:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1266:1268 -> a
+    4:6:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1202 -> a
+    7:56:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1203:1252 -> a
+    57:57:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    57:57:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1252 -> a
+    58:64:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1253:1259 -> a
+com.android.tools.r8.ir.optimize.Outliner$OutlineSiteIdentifier -> com.android.tools.r8.D.e.g0:
     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):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$OutlineSourceCode -> com.android.tools.r8.D.e.h0:
     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
@@ -37044,7 +37233,7 @@
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> e
     boolean verifyRegister(int) -> f
     int instructionIndex(int) -> g
-com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter -> com.android.tools.r8.D.e.j0:
+com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter -> com.android.tools.r8.D.e.i0:
     int pendingNewInstanceIndex -> n
     com.android.tools.r8.graph.DexType returnType -> k
     boolean $assertionsDisabled -> p
@@ -37069,7 +37258,7 @@
     5:10:java.util.List orderedInValues(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):767:772 -> a
     11:23:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):918:930 -> a
     24:30:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):935:941 -> a
-    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     31:31:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):941 -> a
     32:38:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):945:951 -> a
     39:71:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):957:989 -> a
@@ -37088,14 +37277,14 @@
     105:113:void includeInstruction(com.android.tools.r8.ir.code.Instruction):997:1005 -> c
     105:113:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     105:113:void process():760 -> c
-    114:114:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> c
+    114:114:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> c
     114:114:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1006 -> c
     114:114:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     114:114:void process():760 -> c
     115:121:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1006:1012 -> c
     115:121:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     115:121:void process():760 -> c
-    122:122:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> c
+    122:122:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> c
     122:122:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1006 -> c
     122:122:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     122:122:void process():760 -> c
@@ -37105,7 +37294,7 @@
     132:137:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1023:1028 -> c
     132:137:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     132:137:void process():760 -> c
-    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> c
+    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> c
     138:138:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1028 -> c
     138:138:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     138:138:void process():760 -> c
@@ -37118,7 +37307,7 @@
     164:172:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1034:1042 -> c
     164:172:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     164:172:void process():760 -> c
-    173:173:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> c
+    173:173:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> c
     173:173:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1028 -> c
     173:173:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     173:173:void process():760 -> c
@@ -37133,7 +37322,7 @@
     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:
+com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.D.e.k0:
     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
@@ -37169,7 +37358,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():1478:1478 -> a
+    315:315:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
     315:315:com.android.tools.r8.ir.code.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
@@ -37181,20 +37370,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():1478:1478 -> a
+    390:390:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
     390:390:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):454 -> a
-    391:391:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> a
+    391:391:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
     391:391:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):454 -> a
     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():1478:1478 -> a
+    408:408:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> 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.m0:
+com.android.tools.r8.ir.optimize.PhiOptimizations -> com.android.tools.r8.D.e.l0:
     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
@@ -37216,7 +37405,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.p0:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination -> com.android.tools.r8.D.e.o0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.code.DominatorTree dominatorTree -> d
     boolean $assertionsDisabled -> j
@@ -37236,16 +37425,16 @@
     24:24:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     24:24:void run():125 -> a
     25:39:void run():126:140 -> a
-    40:40:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    40:40:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     40:40:void run():140 -> a
     41:46:void run():141:146 -> a
-    47:47:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    47:47:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     47:47:void run():140 -> a
     48:54:void run():148:154 -> a
-    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     55:55:void run():154 -> a
     56:57:void run():155:156 -> a
-    58:58:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    58:58:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     58:58:void run():154 -> a
     59:127:void run():157:225 -> a
     128:154:void run():200:226 -> a
@@ -37255,14 +37444,14 @@
     164:166:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):297:299 -> a
     164:166:void propagateActiveFieldsFrom(com.android.tools.r8.ir.code.BasicBlock):245 -> a
     164:166:void run():229 -> a
-    167:167:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    167:167:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     167:167:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):299 -> a
     167:167:void propagateActiveFieldsFrom(com.android.tools.r8.ir.code.BasicBlock):245 -> a
     167:167:void run():229 -> a
     168:169:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):300:301 -> a
     168:169:void propagateActiveFieldsFrom(com.android.tools.r8.ir.code.BasicBlock):245 -> a
     168:169:void run():229 -> a
-    170:170:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    170:170:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     170:170:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):299 -> a
     170:170:void propagateActiveFieldsFrom(com.android.tools.r8.ir.code.BasicBlock):245 -> a
     170:170:void run():229 -> a
@@ -37279,8 +37468,8 @@
     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.n0:
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject -> com.android.tools.r8.D.e.o0:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1 -> com.android.tools.r8.D.e.m0:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject -> com.android.tools.r8.D.e.n0:
     com.android.tools.r8.graph.DexField field -> a
     com.android.tools.r8.ir.code.Value object -> b
     boolean $assertionsDisabled -> c
@@ -37290,7 +37479,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.q0:
+com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.D.e.p0:
     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
@@ -37307,17 +37496,17 @@
     59:61:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):55:57 -> a
     62:69:com.android.tools.r8.graph.DexType getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeStatic):133:140 -> a
     62:69:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
-    70:70:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    70:70:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     70:70:com.android.tools.r8.graph.DexType getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeStatic):140 -> a
     70:70:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
     71:96:com.android.tools.r8.graph.DexType getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeStatic):142:167 -> a
     71:96:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
-    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     97:97:com.android.tools.r8.graph.DexType getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeStatic):170 -> a
     97:97:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
     98:124:com.android.tools.r8.graph.DexType getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeStatic):172:198 -> a
     98:124:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
-    125:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    125:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     125:125:com.android.tools.r8.graph.DexType getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeStatic):140 -> a
     125:125:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
     126:128:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):60:62 -> a
@@ -37332,7 +37521,7 @@
     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.s0:
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.D.e.r0:
     com.android.tools.r8.graph.AppView appView -> c
     java.util.concurrent.ConcurrentHashMap synthesizedServiceLoaders -> b
     com.android.tools.r8.graph.DexProgramClass synthesizedClass -> a
@@ -37340,29 +37529,29 @@
     2:8:void <init>(com.android.tools.r8.graph.AppView):71:77 -> <init>
     1:1:com.android.tools.r8.graph.DexProgramClass getSynthesizedClass():81:81 -> a
     2:2:void rewrite(com.android.tools.r8.ir.code.IRCode):85:85 -> a
-    3:3:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    3:3:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     3:3:void rewrite(com.android.tools.r8.ir.code.IRCode):86 -> a
     4:29:void rewrite(com.android.tools.r8.ir.code.IRCode):87:112 -> a
-    30:30:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    30:30:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     30:30:void rewrite(com.android.tools.r8.ir.code.IRCode):112 -> a
     31:56:void rewrite(com.android.tools.r8.ir.code.IRCode):113:138 -> a
-    57:57:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    57:57:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     57:57:void rewrite(com.android.tools.r8.ir.code.IRCode):138 -> a
     58:60:void rewrite(com.android.tools.r8.ir.code.IRCode):138:140 -> a
-    61:61:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    61:61:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     61:61:void rewrite(com.android.tools.r8.ir.code.IRCode):141 -> a
     62:65:void rewrite(com.android.tools.r8.ir.code.IRCode):142:145 -> a
-    66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     66:66:void rewrite(com.android.tools.r8.ir.code.IRCode):141 -> a
-    67:67:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    67:67:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     67:67:void rewrite(com.android.tools.r8.ir.code.IRCode):138 -> a
     68:87:void rewrite(com.android.tools.r8.ir.code.IRCode):150:169 -> a
     88:99:void rewrite(com.android.tools.r8.ir.code.IRCode):168:179 -> a
-    100:100:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    100:100:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     100:100:void rewrite(com.android.tools.r8.ir.code.IRCode):112 -> a
     101:102:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):184:185 -> a
     101:102:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
-    103:103:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    103:103:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     103:103:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):185 -> a
     103:103:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
     104:124:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):186:206 -> a
@@ -37375,7 +37564,7 @@
     126:126:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
     127:137:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):206:216 -> a
     127:137:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
-    138:138:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> a
+    138:138:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> a
     138:138:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):213 -> a
     138:138:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
     139:146:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):218:225 -> a
@@ -37407,10 +37596,10 @@
     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:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     254:254:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):172 -> a
     255:255:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):173:173 -> a
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.D.e.r0:
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.D.e.q0:
     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
@@ -37420,7 +37609,7 @@
     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.optimize.SwitchCaseEliminator -> com.android.tools.r8.D.e.s0:
     com.android.tools.r8.ir.code.IntSwitch theSwitch -> d
     com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
     boolean mayHaveIntroducedUnreachableBlocks -> e
@@ -37458,7 +37647,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.u0:
+com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.D.e.t0:
     com.android.tools.r8.graph.DexString switchMapPrefix -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexString kotlinSwitchMapPrefix -> c
@@ -37470,15 +37659,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():875:875 -> a
+    19:19:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
     19:19:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):105 -> a
     20:56:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):107:143 -> a
-    57:57:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
+    57:57:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
     57:57:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):105 -> a
     58:58:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):107:107 -> a
     59:61:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):148:150 -> a
-com.android.tools.r8.ir.optimize.SwitchUtils$1 -> com.android.tools.r8.D.e.v0:
-com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo -> com.android.tools.r8.D.e.w0:
+com.android.tools.r8.ir.optimize.SwitchUtils$1 -> com.android.tools.r8.D.e.u0:
+com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo -> com.android.tools.r8.D.e.v0:
     com.android.tools.r8.ir.code.Instruction arrayGet -> b
     com.android.tools.r8.ir.code.Instruction staticGet -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap indexMap -> d
@@ -37486,7 +37675,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.z0:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization -> com.android.tools.r8.D.e.y0:
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> h
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> i
@@ -37542,7 +37731,7 @@
     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
+    323:323:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):475:475 -> a
     323:323:void rewrite(com.android.tools.r8.ir.code.IRCode):428 -> a
     324:326:void rewrite(com.android.tools.r8.ir.code.IRCode):429:431 -> a
     327:331:void logResults():458:462 -> a
@@ -37562,19 +37751,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.x0:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy -> com.android.tools.r8.D.e.w0:
     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.y0:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLense -> com.android.tools.r8.D.e.x0:
     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.F0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector -> com.android.tools.r8.D.e.E0:
     com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map removedArguments -> d
@@ -37588,42 +37777,47 @@
     2:2:com.android.tools.r8.utils.MethodSignatureEquivalence access$100():45:45 -> a
     3:9:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):98:104 -> a
     10:36:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):98:124 -> a
-    37:37:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217:217 -> a
-    38:57:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):280:299 -> a
-    58:58:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    58:58:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):299 -> a
-    59:70:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):300:311 -> a
-    71:71:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo.builder():119:119 -> a
-    71:71:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):313 -> a
-    72:74:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):314:316 -> a
-    75:82:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):312:319 -> a
-    83:86:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):326:329 -> a
-    87:87:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    87:87:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):329 -> a
-    88:96:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):329:337 -> a
-    97:97:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    97:97:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):337 -> a
-    98:104:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):338:344 -> a
-    1:1:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):221:221 -> b
-    2:2:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> b
-    2:2:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):222 -> b
-    3:9:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):222:228 -> b
-    10:10:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod):275:275 -> b
-    10:10:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):229 -> b
-    11:23:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):230:242 -> b
-    24:24:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> b
-    24:24:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):222 -> b
-    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.A0:
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> com.android.tools.r8.D.e.B0:
+    37:37:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):221:221 -> a
+    37:37:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    38:38:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    38:38:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):222 -> a
+    38:38:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    39:45:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):222:228 -> a
+    39:45:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    46:46:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod):275:275 -> a
+    46:46:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):229 -> a
+    46:46:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    47:59:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):230:242 -> a
+    47:59:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    60:60:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    60:60:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):222 -> a
+    60:60:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    61:80:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):280:299 -> a
+    81:81:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
+    81:81:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):299 -> a
+    82:93:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):300:311 -> a
+    94:94:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo.builder():119:119 -> a
+    94:94:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):313 -> a
+    95:97:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):314:316 -> a
+    98:105:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):312:319 -> a
+    106:109:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):326:329 -> a
+    110:110:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
+    110:110:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):329 -> a
+    111:119:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):329:337 -> a
+    120:120:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
+    120:120:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):337 -> a
+    121:127:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):338:344 -> a
+    1:18:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):248:265 -> b
+    19:24:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):264:269 -> b
+    1:1:java.lang.Runnable runnableForClass(com.android.tools.r8.graph.DexProgramClass):217:217 -> c
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1 -> com.android.tools.r8.D.e.z0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> com.android.tools.r8.D.e.A0:
     java.util.BitSet used -> a
     1:3:void <init>():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.C0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$GloballyUsedSignatures -> com.android.tools.r8.D.e.B0:
     com.android.tools.r8.ir.optimize.UnusedArgumentsCollector this$0 -> b
     com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool methodPool -> a
     1:2:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):183:184 -> <init>
@@ -37633,11 +37827,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.D0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UnusedArgumentsGraphLense -> com.android.tools.r8.D.e.C0:
     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.E0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures -> com.android.tools.r8.D.e.D0:
     com.android.tools.r8.ir.optimize.UnusedArgumentsCollector this$0 -> c
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> a
     java.util.Set usedSignatures -> b
@@ -37661,7 +37855,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.G0.b:
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.D.e.F0.b:
     java.util.concurrent.ConcurrentHashMap knownClasses -> b
     com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> a
     boolean $assertionsDisabled -> c
@@ -37687,19 +37881,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():875:875 -> a
+    34:34:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
     34:34:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):172 -> a
     35:81:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):172:218 -> a
     82:84:void logIneligibleUser(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionOrPhi):77:79 -> a
     82:84:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):218 -> a
     85:94:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):223:232 -> a
-    95:95:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1017:1017 -> a
+    95:95:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1089:1089 -> a
     95:95:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):233 -> a
     96:97:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):234:235 -> a
     98:98:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     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.G0.a:
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus -> com.android.tools.r8.D.e.F0.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
@@ -37717,7 +37911,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.G0.c:
+com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.tools.r8.D.e.F0.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
@@ -37737,21 +37931,21 @@
     29:45:com.android.tools.r8.ir.code.Value getOrCreateInValue(com.android.tools.r8.ir.code.BasicBlock):101:117 -> a
     1:13:com.android.tools.r8.ir.code.Value getOrCreateOutValue(com.android.tools.r8.ir.code.BasicBlock):69:81 -> b
     14:24:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):123:133 -> b
-    25:25:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    25:25:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     25:25:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):133 -> b
     26:26:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):133:133 -> b
-    27:27:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    27:27:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     27:27:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):133 -> b
     28:38:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):142:152 -> b
     39:39:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> b
     39:39:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):152 -> b
-    40:40:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> b
+    40:40:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> b
     40:40:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):151 -> b
     41:45:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):151:155 -> b
     46:46:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):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.G0.d:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.D.e.F0.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
@@ -37773,53 +37967,53 @@
     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):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):582 -> a
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    2:2:boolean lambda$isEligibleConstructorCall$1(com.android.tools.r8.ir.code.Value):589 -> a
+    3:3:boolean lambda$isEligibleConstructorCall$1(com.android.tools.r8.ir.code.Value):589:589 -> a
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    4:4:boolean lambda$isEligibleConstructorCall$1(com.android.tools.r8.ir.code.Value):589 -> a
     5:34:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):262:291 -> a
-    35:47:com.android.tools.r8.graph.DexEncodedMethod findSingleTarget(com.android.tools.r8.ir.code.InvokeMethod):955:967 -> a
+    35:47:com.android.tools.r8.graph.DexEncodedMethod findSingleTarget(com.android.tools.r8.ir.code.InvokeMethod):962:974 -> 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:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):800:807 -> a
     86:93:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    94:94:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> 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.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    94:94:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):807 -> a
     94:94:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    95:102:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):800:807 -> a
+    95:102:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):807:814 -> a
     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):807 -> a
+    103:103:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):814 -> a
     103:103:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    104:104:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> 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.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    104:104:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):807 -> a
     104:104:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    105:105:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):812:812 -> a
+    105:105:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):819:819 -> a
     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:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):847:848 -> a
+    106:107:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):822 -> a
     106:107:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    108:108:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():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):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.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    108:108:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):848 -> a
+    108:108:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):822 -> a
     108:108:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    109:116:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):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:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):849:856 -> a
+    109:116:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):822 -> a
     109:116:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    117:117:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():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):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.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    117:117:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):848 -> a
+    117:117:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):822 -> a
     117:117:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    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:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):826:837 -> 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:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     138:138:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370 -> a
     139:139:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370:370 -> a
-    140:140:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    140:140:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     140:140:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370 -> a
     141:147:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):409:415 -> a
     141:147:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):371 -> a
@@ -37834,82 +38028,82 @@
     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):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):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):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
+    186:238:void removeMiscUsages(com.android.tools.r8.ir.code.IRCode):460:512 -> a
+    186:238:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):401 -> a
+    239:255:void removeFieldReads(com.android.tools.r8.ir.code.IRCode):518:534 -> a
+    239:255:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):402 -> a
+    256:271:void removeFieldWrites():563:578 -> a
+    256:271:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):403 -> a
+    272:274:void removeFieldWrites():572:574 -> a
+    272:274:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):403 -> a
+    275:277:void removeFieldWrites():565:567 -> a
+    275:277:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):403 -> a
+    278:278:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):404:404 -> a
+    279:283:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):542:546 -> a
+    284:295:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):545:556 -> 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 replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):556 -> a
+    297:297:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):557:557 -> a
+    298:298:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    298:298:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):557 -> a
+    299:302:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):556:559 -> a
+    303:303:com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper lambda$replaceFieldRead$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):546:546 -> a
+    304:309: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):584:589 -> a
+    310:362: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):588:640 -> a
+    363:393:boolean isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):655:685 -> a
+    363:393:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):703 -> a
+    394: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):694:696 -> a
+    397:403: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):695:701 -> a
+    404:404: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):699:699 -> a
+    405:407:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod):707:709 -> a
+    408:408:boolean lambda$isEligibleIndirectVirtualMethodCall$4(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):710:710 -> a
+    409:445:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleVirtualMethodCall(boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):720:756 -> a
+    446:451:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):760:765 -> a
+    452:452:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    452:452:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):765 -> a
+    453:453:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):765:765 -> a
+    454:454:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    454:454:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):765 -> a
+    455:458:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):769:772 -> a
+    459:489:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):869:899 -> a
+    490:495:boolean isTrivialInitializer(com.android.tools.r8.graph.DexMethod):930:935 -> a
+    490:495:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):900 -> a
+    496:522:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):895:921 -> a
+    523:523:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):917:917 -> a
+    524:537:boolean isEligibleSingleTarget(com.android.tools.r8.graph.DexEncodedMethod):981:994 -> a
+    538:538:boolean isEligibleSingleTarget(com.android.tools.r8.graph.DexEncodedMethod):993:993 -> a
+    539:539:void lambda$removeInstruction$5(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1008:1008 -> a
+    540:541:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1008:1009 -> a
     1:103:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassAndUsageEligible():148:250 -> b
     104:104:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassAndUsageEligible():234:234 -> b
-    105:105:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> 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):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
+    105:105:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    105:105:boolean lambda$isEligibleDirectVirtualMethodCall$2(com.android.tools.r8.ir.code.Value):696 -> b
+    106:106:boolean lambda$isEligibleDirectVirtualMethodCall$2(com.android.tools.r8.ir.code.Value):696:696 -> b
+    107:107:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    107:107:boolean lambda$isEligibleDirectVirtualMethodCall$2(com.android.tools.r8.ir.code.Value):696 -> b
+    108:121:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):939:952 -> b
+    108:121:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):956 -> b
     122:122:boolean com.android.tools.r8.kotlin.KotlinSyntheticClass.isLambda():48:48 -> b
-    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
+    122:122:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):952 -> b
+    122:122:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):956 -> b
+    123:123:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):957:957 -> 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:
+com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo -> com.android.tools.r8.D.e.G0.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.H0.b:
+com.android.tools.r8.ir.optimize.info.DefaultCallSiteOptimizationInfo -> com.android.tools.r8.D.e.G0.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.H0.c:
+com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo -> com.android.tools.r8.D.e.G0.c:
     com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -37920,7 +38114,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.H0.d:
+com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo -> com.android.tools.r8.D.e.G0.d:
     boolean UNKNOWN_TRIGGERS_CLASS_INIT_BEFORE_ANY_SIDE_EFFECT -> m
     boolean UNKNOWN_INITIALIZER_ENABLING_JAVA_ASSERTIONS -> p
     boolean DOES_NOT_USE_IDNETIFIER_NAME_STRING -> k
@@ -37984,7 +38178,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.H0.e:
+com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo -> com.android.tools.r8.D.e.G0.e:
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo asMutableFieldOptimizationInfo() -> a
     boolean cannotBeKept() -> b
@@ -37994,7 +38188,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.H0.g:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo -> com.android.tools.r8.D.e.G0.g:
     long getReturnedConstantNumber() -> A
     com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility() -> B
     java.util.Set getInitializedClassesOnNormalExit() -> C
@@ -38028,13 +38222,106 @@
     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.H0.f:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference -> com.android.tools.r8.D.e.G0.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.H0.k:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector -> com.android.tools.r8.D.e.G0.i:
+    com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
+    com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.utils.InternalOptions options -> b
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():62:62 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView):67:70 -> <init>
+    1:57:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):109:165 -> a
+    58:101:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):140:183 -> a
+    102:105:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):445:448 -> a
+    106:112:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):447:453 -> a
+    113:113:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):452:452 -> a
+    114:114:boolean triggersClassInitializationBeforeSideEffect(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):465:465 -> a
+    115:131:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$triggersClassInitializationBeforeSideEffect$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):468:484 -> a
+    132:190:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):496:554 -> a
+    191:230:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):515:554 -> a
+    231:243:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):542:554 -> a
+    244:244:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):565:565 -> a
+    245:249:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):568:572 -> a
+    250:265:boolean isKotlinNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):648:663 -> a
+    250:265:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):574 -> a
+    266:285:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):575:594 -> a
+    286:291:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):593:598 -> a
+    292:299:boolean isInstantiationOfNullPointerException(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.graph.DexItemFactory):682:689 -> a
+    292:299:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):598 -> a
+    300:320:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):599:619 -> a
+    321:323:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):671:673 -> a
+    324:332:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):701:709 -> a
+    333:333:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    333:333:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):709 -> a
+    334:341:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):712:719 -> a
+    342:348:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):726:732 -> a
+    349:349:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    349:349:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):727 -> a
+    350:350:boolean lambda$computeMayHaveSideEffects$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):774:774 -> a
+    351:382:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):847:878 -> a
+    383:428:boolean isNormalExitDominated(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):900:945 -> a
+    383:428:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):879 -> a
+    429:434:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):885:890 -> a
+    1:40:void identifyReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):216:255 -> b
+    41:52:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):740:751 -> b
+    53:62:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:50 -> b
+    53:62:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    63:63:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    63:63:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):50 -> b
+    63:63:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    64:67:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):51:54 -> b
+    64:67:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    68:68:com.android.tools.r8.ir.analysis.AbstractError com.android.tools.r8.ir.code.Instruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):539:539 -> b
+    68:68:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):55 -> b
+    68:68:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    69:77:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):55:63 -> b
+    69:77:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    78:78:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56:56 -> b
+    78:78:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    79:79:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    79:79:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):50 -> b
+    79:79:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    80:93:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):69:82 -> b
+    80:93:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    94:149:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):75:130 -> b
+    94:149:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    150:150:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():31:31 -> b
+    150:150:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):753 -> b
+    151:152:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):754:755 -> b
+    153:153:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.canBePostponed():27:27 -> b
+    153:153:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):756 -> b
+    154:154:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):757:757 -> b
+    155:155:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():31:31 -> b
+    155:155:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):753 -> b
+    156:159:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):762:765 -> b
+    160:168:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):784:792 -> b
+    160:168:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):765 -> b
+    169:173:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):773:777 -> b
+    1:17:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):261:277 -> c
+    18:87:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeInstanceInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.function.Function):371:440 -> c
+    18:87:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):277 -> c
+    88:144:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeClassInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):290:346 -> c
+    88:144:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):278 -> c
+    145:202:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeClassInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):296:353 -> c
+    145:202:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):278 -> c
+    203:203:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):274:274 -> c
+    204:226:void computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):820:842 -> c
+    1:7:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):807:813 -> d
+    8:8:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> d
+    8:8:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):811 -> d
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect -> com.android.tools.r8.D.e.G0.h:
+    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect DESIRED_EFFECT -> a
+    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect NO_EFFECT -> d
+    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect OTHER_EFFECT -> c
+    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect CONDITIONAL_EFFECT -> b
+    1:4:void <clinit>():638:641 -> <clinit>
+    1:1:void <init>(java.lang.String,int):637:637 -> <init>
+com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo -> com.android.tools.r8.D.e.G0.m:
     java.util.Map callSiteInfos -> b
     com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection cachedRepresentative -> c
     boolean $assertionsDisabled -> d
@@ -38068,8 +38355,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.H0.h:
-com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection -> com.android.tools.r8.D.e.H0.j:
+com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$1 -> com.android.tools.r8.D.e.G0.j:
+com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection -> com.android.tools.r8.D.e.G0.l:
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement[] dynamicTypes -> a
     com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection BOTTOM -> b
     boolean $assertionsDisabled -> c
@@ -38087,11 +38374,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.H0.i:
+com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection$1 -> com.android.tools.r8.D.e.G0.k:
     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.H0.l:
+com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo -> com.android.tools.r8.D.e.G0.n:
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement dynamicType -> d
     boolean cannotBeKept -> b
     boolean valueHasBeenPropagated -> c
@@ -38115,7 +38402,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.H0.n:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.D.e.G0.p:
     1:1:void <init>():20:20 -> <init>
     void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
@@ -38155,10 +38442,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.H0.m:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer -> com.android.tools.r8.D.e.G0.o:
     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.H0.o:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed -> com.android.tools.r8.D.e.G0.q:
     java.util.Map fieldOptimizationInfos -> a
     java.util.Map methodOptimizationInfos -> b
     java.util.Map processed -> c
@@ -38200,7 +38487,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.H0.q:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore -> com.android.tools.r8.D.e.G0.s:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore INSTANCE -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():24:24 -> <init>
@@ -38233,9 +38520,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.H0.p:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore$1 -> com.android.tools.r8.D.e.G0.r:
     1:1:void <init>():22:22 -> <init>
-com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.D.e.H0.r:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.D.e.G0.t:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple INSTANCE -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():24:24 -> <init>
@@ -38270,7 +38557,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.H0.u:
+com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo -> com.android.tools.r8.D.e.G0.w:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList parametersUsages -> a
     1:1:void <clinit>():27:27 -> <clinit>
@@ -38278,7 +38565,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.H0.s:
+com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage -> com.android.tools.r8.D.e.G0.u:
     java.util.List callsReceiver -> c
     boolean hasFieldRead -> e
     boolean isAssignedToField -> f
@@ -38288,7 +38575,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.H0.t:
+com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsageBuilder -> com.android.tools.r8.D.e.G0.v:
     boolean $assertionsDisabled -> i
     java.util.Set ifZeroTestTypes -> c
     java.util.List callsOnReceiver -> d
@@ -38322,7 +38609,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.H0.v:
+com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo -> com.android.tools.r8.D.e.G0.x:
     boolean returnsConstantNumber -> i
     boolean returnsConstantString -> k
     boolean initializerEnablingJavaAssertions -> u
@@ -38351,120 +38638,216 @@
     boolean neverReturnsNull -> g
     boolean cannotBeKept -> a
     1:1:void <clinit>():23:23 -> <clinit>
-    1:1:void <init>():81:81 -> <init>
-    2:56:void <init>():25:79 -> <init>
-    57:57:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):85:85 -> <init>
-    58:139:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):25:106 -> <init>
-    1:2:long getReturnedConstantNumber():247:248 -> A
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility():242:242 -> B
-    1:1:java.util.Set getInitializedClassesOnNormalExit():166:166 -> C
-    1:1:boolean isInitializerEnablingJavaAssertions():259:259 -> D
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo():171:171 -> E
-    1:1:java.util.BitSet getNonNullParamOrThrow():181:181 -> F
-    1:1:void markAsPropagated():425:425 -> G
-    1:1:void markCannotBeKept():142:142 -> H
-    1:1:void markClassInitializerMayBePostponed():151:151 -> I
-    1:2:void markForceInline():392:393 -> J
-    1:1:void markMayNotHaveSideEffects():336:336 -> K
-    1:2:void markNeverInline():406:407 -> L
-    1:1:void markNeverReturnsNormally():348:348 -> M
-    1:1:void markNeverReturnsNull():344:344 -> N
-    1:1:void markReturnValueOnlyDependsOnArguments():340:340 -> O
-    1:1:void markUseIdentifierNameString():412:412 -> P
-    1:1:void setInitializerEnablingJavaAssertions():322:322 -> Q
-    1:6:void fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):111:116 -> a
-    7:7:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage getParameterUsages(int):176:176 -> a
-    8:8:void setParameterUsages(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo):298:298 -> a
-    9:9:void setNonNullParamOnNormalExits(java.util.BitSet):306:306 -> a
-    10:10:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):314:314 -> a
-    11:11:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):318:318 -> a
-    12:12:void markInitializesClassesOnNormalExit(java.util.Set):326:326 -> a
-    13:17:void markReturnsConstantNumber(long):352:356 -> a
-    18:22:void markReturnsConstantString(com.android.tools.r8.graph.DexString):360:364 -> a
-    23:29:void markReturnsObjectOfType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):368:374 -> a
-    30:36:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):378:384 -> a
-    37:42:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):381:386 -> a
-    43:43:void markCheckNullReceiverBeforeAnySideEffect(boolean):416:416 -> a
-    44:45:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo mutableCopy():435:436 -> a
-    1:1:java.util.BitSet getNonNullParamOnNormalExits():186:186 -> b
-    2:2:void setNonNullParamOrThrow(java.util.BitSet):302:302 -> b
-    3:5:void markReturnsArgument(int):330:332 -> b
-    6:6:void markTriggerClassInitBeforeAnySideEffect(boolean):420:420 -> b
-    1:1:boolean cannotBeKept():137:137 -> c
-    2:2:void setReachabilitySensitive(boolean):310:310 -> c
-    1:1:boolean checksNullReceiverBeforeAnySideEffect():279:279 -> d
-    1:1:boolean returnValueHasBeenPropagated():430:430 -> e
-    1:1:boolean classInitializerMayBePostponed():147:147 -> f
-    1:2:int getReturnedArgument():210:211 -> g
-    1:2:com.android.tools.r8.graph.DexString getReturnedConstantString():253:254 -> h
-    1:1:boolean returnValueOnlyDependsOnArguments():294:294 -> i
-    1:1:boolean neverInline():274:274 -> j
-    1:1:boolean neverReturnsNormally():221:221 -> k
-    1:2:boolean returnsConstant():226:227 -> l
-    1:1:boolean returnsConstantString():237:237 -> m
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicReturnType():156:156 -> n
-    1:1:boolean useIdentifierNameString():264:264 -> o
-    1:1:boolean triggersClassInitBeforeAnySideEffect():284:284 -> p
-    1:1:boolean returnsConstantNumber():232:232 -> q
-    1:1:boolean returnsArgument():205:205 -> r
+    1:1:void <init>():83:83 -> <init>
+    2:58:void <init>():25:81 -> <init>
+    59:59:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):87:87 -> <init>
+    60:143:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):25:108 -> <init>
+    1:2:long getReturnedConstantNumber():249:250 -> A
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility():244:244 -> B
+    1:1:java.util.Set getInitializedClassesOnNormalExit():168:168 -> C
+    1:1:boolean isInitializerEnablingJavaAssertions():261:261 -> D
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo():173:173 -> E
+    1:1:java.util.BitSet getNonNullParamOrThrow():183:183 -> F
+    1:41:void adjustOptimizationInfoAfterRemovingThisParameter():444:484 -> G
+    1:1:void markAsPropagated():427:427 -> H
+    1:1:void markCannotBeKept():144:144 -> I
+    1:1:void markClassInitializerMayBePostponed():153:153 -> J
+    1:2:void markForceInline():394:395 -> K
+    1:1:void markMayNotHaveSideEffects():338:338 -> L
+    1:2:void markNeverInline():408:409 -> M
+    1:1:void markNeverReturnsNormally():350:350 -> N
+    1:1:void markNeverReturnsNull():346:346 -> O
+    1:1:void markReturnValueOnlyDependsOnArguments():342:342 -> P
+    1:1:void markUseIdentifierNameString():414:414 -> Q
+    1:1:void setInitializerEnablingJavaAssertions():324:324 -> R
+    1:6:void fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):113:118 -> a
+    7:7:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage getParameterUsages(int):178:178 -> a
+    8:8:void setParameterUsages(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo):300:300 -> a
+    9:9:void setNonNullParamOnNormalExits(java.util.BitSet):308:308 -> a
+    10:10:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):316:316 -> a
+    11:11:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):320:320 -> a
+    12:12:void markInitializesClassesOnNormalExit(java.util.Set):328:328 -> a
+    13:17:void markReturnsConstantNumber(long):354:358 -> a
+    18:22:void markReturnsConstantString(com.android.tools.r8.graph.DexString):362:366 -> a
+    23:29:void markReturnsObjectOfType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):370:376 -> a
+    30:36:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):380:386 -> a
+    37:42:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):383:388 -> a
+    43:43:void markCheckNullReceiverBeforeAnySideEffect(boolean):418:418 -> a
+    44:45:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo mutableCopy():437:438 -> a
+    1:1:java.util.BitSet getNonNullParamOnNormalExits():188:188 -> b
+    2:2:void setNonNullParamOrThrow(java.util.BitSet):304:304 -> b
+    3:5:void markReturnsArgument(int):332:334 -> b
+    6:6:void markTriggerClassInitBeforeAnySideEffect(boolean):422:422 -> b
+    1:1:boolean cannotBeKept():139:139 -> c
+    2:2:void setReachabilitySensitive(boolean):312:312 -> c
+    1:1:boolean checksNullReceiverBeforeAnySideEffect():281:281 -> d
+    1:1:boolean returnValueHasBeenPropagated():432:432 -> e
+    1:1:boolean classInitializerMayBePostponed():149:149 -> f
+    1:2:int getReturnedArgument():212:213 -> g
+    1:2:com.android.tools.r8.graph.DexString getReturnedConstantString():255:256 -> h
+    1:1:boolean returnValueOnlyDependsOnArguments():296:296 -> i
+    1:1:boolean neverInline():276:276 -> j
+    1:1:boolean neverReturnsNormally():223:223 -> k
+    1:2:boolean returnsConstant():228:229 -> l
+    1:1:boolean returnsConstantString():239:239 -> m
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicReturnType():158:158 -> n
+    1:1:boolean useIdentifierNameString():266:266 -> o
+    1:1:boolean triggersClassInitBeforeAnySideEffect():286:286 -> p
+    1:1:boolean returnsConstantNumber():234:234 -> q
+    1:1:boolean returnsArgument():207:207 -> r
     boolean isUpdatableMethodOptimizationInfo() -> s
-    1:1:boolean neverReturnsNull():216:216 -> t
-    1:1:boolean isReachabilitySensitive():200:200 -> u
+    1:1:boolean neverReturnsNull():218:218 -> t
+    1:1:boolean isReachabilitySensitive():202:202 -> u
     com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo asUpdatableMethodOptimizationInfo() -> v
-    1:1:boolean forceInline():269:269 -> w
+    1:1:boolean forceInline():271:271 -> w
     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.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.D.e.I0.a:
+    1:1:boolean mayHaveSideEffects():291:291 -> y
+    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType():163:163 -> z
+com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.D.e.H0.a:
+    boolean $assertionsDisabled -> a
+    1:1:void <clinit>():14:14 -> <clinit>
+    1:3:void collectAllMonitorEnterValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):20:22 -> a
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    4:4:void collectAllMonitorEnterValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):22 -> a
+    5:5:void collectAllMonitorEnterValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):23:23 -> a
+    6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    6:6:void collectAllMonitorEnterValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):22 -> a
+    7:7:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32:32 -> a
+    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    8:8:boolean com.android.tools.r8.ir.code.Value.hasAliasedValue():243 -> a
+    8:8:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32 -> a
+    9:9:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32:32 -> a
+    10:10:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    10:10:boolean com.android.tools.r8.ir.code.Value.hasAliasedValue():243 -> a
+    10:10:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32 -> a
+    11:14:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):33:36 -> a
+    15:15:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):34:34 -> a
+com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.D.e.H0.b:
     com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter INSTANCE -> a
-    1:1:void <clinit>():13:13 -> <clinit>
-    1:1:void <init>():16:16 -> <init>
-    void reportInstructionBudgetIsExceeded() -> a
-    void reportPotentialExplosionInExceptionalControlFlowResolutionBlocks(int,int) -> a
+    1:1:void <clinit>():15:15 -> <clinit>
+    1:1:void <init>():18:18 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter getInstance():21:21 -> A
+    void reportBlacklisted() -> a
+    void reportIncorrectArity(int,int) -> a
+    void reportInvalidInliningReason(com.android.tools.r8.ir.optimize.Inliner$Reason,java.util.Set) -> 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 reportCallerNotSameClass() -> b
+    void reportPotentialExplosionInExceptionalControlFlowResolutionBlocks(int,int) -> b
+    void reportCallerNotSameNest() -> c
+    void reportWillExceedInstructionBudget(int,int) -> c
+    void reportCallerNotSamePackage() -> d
+    void reportWillExceedMonitorEnterValuesBudget(int,int) -> d
+    void reportCallerNotSubtype() -> e
+    void reportClasspathMethod() -> f
+    void reportInaccessible() -> g
+    void reportInlineeDoesNotHaveCode() -> h
+    void reportInlineeNotInliningCandidate() -> i
+    void reportInlineeNotProcessed() -> j
+    void reportInlineeNotSimple() -> k
+    void reportInlineeRefersToClassesNotInMainDex() -> l
+    void reportInliningAcrossFeatureSplit() -> m
+    void reportInstructionBudgetIsExceeded() -> n
+    void reportInvalidDoubleInliningCandidate() -> o
+    void reportLibraryMethod() -> p
+    void reportMarkedAsNeverInline() -> q
+    void reportMustTriggerClassInitialization() -> r
+    void reportNoInliningIntoConstructorsWhenGeneratingClassFiles() -> s
+    void reportPinned() -> t
+    void reportProcessedConcurrently() -> u
+    void reportReceiverDefinitelyNull() -> v
+    void reportReceiverMaybeNull() -> w
+    void reportRecursiveMethod() -> x
+    void reportUnknownTarget() -> y
+    boolean verifyReasonHasBeenReported() -> z
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.D.e.H0.c:
+    1:1:void <init>():18:18 -> <init>
+    void reportBlacklisted() -> a
+    void reportIncorrectArity(int,int) -> a
+    void reportInvalidInliningReason(com.android.tools.r8.ir.optimize.Inliner$Reason,java.util.Set) -> 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:
+    1:5:com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter createFor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):22:26 -> a
+    6:20:void handleInvokeWithUnknownTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):31:45 -> a
+    void reportCallerNotSameClass() -> b
+    void reportPotentialExplosionInExceptionalControlFlowResolutionBlocks(int,int) -> b
+    void reportCallerNotSameNest() -> c
+    void reportWillExceedInstructionBudget(int,int) -> c
+    void reportCallerNotSamePackage() -> d
+    void reportWillExceedMonitorEnterValuesBudget(int,int) -> d
+    void reportCallerNotSubtype() -> e
+    void reportClasspathMethod() -> f
+    void reportInaccessible() -> g
+    void reportInlineeDoesNotHaveCode() -> h
+    void reportInlineeNotInliningCandidate() -> i
+    void reportInlineeNotProcessed() -> j
+    void reportInlineeNotSimple() -> k
+    void reportInlineeRefersToClassesNotInMainDex() -> l
+    void reportInliningAcrossFeatureSplit() -> m
+    void reportInstructionBudgetIsExceeded() -> n
+    void reportInvalidDoubleInliningCandidate() -> o
+    void reportLibraryMethod() -> p
+    void reportMarkedAsNeverInline() -> q
+    void reportMustTriggerClassInitialization() -> r
+    void reportNoInliningIntoConstructorsWhenGeneratingClassFiles() -> s
+    void reportPinned() -> t
+    void reportProcessedConcurrently() -> u
+    void reportReceiverDefinitelyNull() -> v
+    void reportReceiverMaybeNull() -> w
+    void reportRecursiveMethod() -> x
+    void reportUnknownTarget() -> y
+    boolean verifyReasonHasBeenReported() -> z
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.D.e.H0.d:
     com.android.tools.r8.graph.DexEncodedMethod callee -> a
     boolean $assertionsDisabled -> e
     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:
+    1:1:void <clinit>():16:16 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):25:25 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):22:28 -> <init>
+    1:11:void print(java.lang.String):32:42 -> a
+    12:12:void printWithExceededThreshold(java.lang.String,java.lang.String,int,int):47:47 -> a
+    13:13:void reportBlacklisted():52:52 -> a
+    14:14:void reportIncorrectArity(int,int):92:92 -> a
+    15:19:void reportInvalidInliningReason(com.android.tools.r8.ir.optimize.Inliner$Reason,java.util.Set):146:150 -> a
+    20:20:void reportInvalidInliningReason(com.android.tools.r8.ir.optimize.Inliner$Reason,java.util.Set):146:146 -> a
+    21:25:void reportUnsafeConstructorInliningDueToFinalFieldAssignment(com.android.tools.r8.ir.code.InstancePut):219:223 -> a
+    26:26:void reportUnsafeConstructorInliningDueToFinalFieldAssignment(com.android.tools.r8.ir.code.InstancePut):219:219 -> a
+    27:29:void reportUnsafeConstructorInliningDueToIndirectConstructorCall(com.android.tools.r8.ir.code.InvokeDirect):229:231 -> a
+    30:30:void reportUnsafeConstructorInliningDueToIndirectConstructorCall(com.android.tools.r8.ir.code.InvokeDirect):229:229 -> a
+    31:31:void reportUnsafeConstructorInliningDueToUninitializedObjectUse(com.android.tools.r8.ir.code.Instruction):237:237 -> a
+    1:1:void reportCallerNotSameClass():57:57 -> b
+    2:2:void reportPotentialExplosionInExceptionalControlFlowResolutionBlocks(int,int):184:184 -> b
+    1:1:void reportCallerNotSameNest():62:62 -> c
+    2:2:void reportWillExceedInstructionBudget(int,int):242:242 -> c
+    1:1:void reportCallerNotSamePackage():67:67 -> d
+    2:2:void reportWillExceedMonitorEnterValuesBudget(int,int):252:252 -> d
+    1:1:void reportCallerNotSubtype():74:74 -> e
+    1:1:void reportClasspathMethod():82:82 -> f
+    1:1:void reportInaccessible():87:87 -> g
+    1:1:void reportInlineeDoesNotHaveCode():102:102 -> h
+    1:1:void reportInlineeNotInliningCandidate():107:107 -> i
+    1:1:void reportInlineeNotProcessed():112:112 -> j
+    1:1:void reportInlineeNotSimple():117:117 -> k
+    1:1:void reportInlineeRefersToClassesNotInMainDex():124:124 -> l
+    1:1:void reportInliningAcrossFeatureSplit():131:131 -> m
+    1:1:void reportInstructionBudgetIsExceeded():136:136 -> n
+    1:1:void reportInvalidDoubleInliningCandidate():141:141 -> o
+    1:1:void reportLibraryMethod():156:156 -> p
+    1:1:void reportMarkedAsNeverInline():161:161 -> q
+    1:1:void reportMustTriggerClassInitialization():166:166 -> r
+    1:1:void reportNoInliningIntoConstructorsWhenGeneratingClassFiles():173:173 -> s
+    1:1:void reportPinned():178:178 -> t
+    1:1:void reportProcessedConcurrently():193:193 -> u
+    1:1:void reportReceiverDefinitelyNull():199:199 -> v
+    1:1:void reportReceiverMaybeNull():204:204 -> w
+    1:1:void reportRecursiveMethod():209:209 -> x
+    1:1:void reportUnknownTarget():214:214 -> y
+    1:1:boolean verifyReasonHasBeenReported():261:261 -> z
+com.android.tools.r8.ir.optimize.lambda.CaptureSignature -> com.android.tools.r8.D.e.I0.a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList SINGLE_LIST -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList EMPTY_LIST -> a
     boolean $assertionsDisabled -> c
@@ -38485,7 +38868,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.J0.d:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor -> com.android.tools.r8.D.e.I0.d:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy NoOp -> j
@@ -38529,7 +38912,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.J0.b:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor$1 -> com.android.tools.r8.D.e.I0.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
@@ -38541,7 +38924,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.J0.c:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy -> com.android.tools.r8.D.e.I0.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
@@ -38552,7 +38935,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.J0.g:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup -> com.android.tools.r8.D.e.I0.g:
     java.util.Map lambdas -> c
     com.android.tools.r8.ir.optimize.lambda.LambdaGroupId id -> a
     com.android.tools.r8.graph.DexType classType -> b
@@ -38577,7 +38960,7 @@
     11:24:java.lang.String createHash(java.util.List):182:195 -> b
     11:24:com.android.tools.r8.graph.DexProgramClass synthesizeClass(com.android.tools.r8.graph.DexItemFactory):174 -> b
     25:25:com.android.tools.r8.graph.DexProgramClass synthesizeClass(com.android.tools.r8.graph.DexItemFactory):174:174 -> b
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
+    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
     26:26:com.android.tools.r8.graph.DexProgramClass synthesizeClass(com.android.tools.r8.graph.DexItemFactory):173 -> b
     27:29:com.android.tools.r8.graph.DexProgramClass synthesizeClass(com.android.tools.r8.graph.DexItemFactory):173:175 -> b
     30:30:java.lang.String createHash(java.util.List):197:197 -> b
@@ -38590,14 +38973,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.J0.e:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo -> com.android.tools.r8.D.e.I0.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.J0.f:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError -> com.android.tools.r8.D.e.I0.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.J0.h:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder -> com.android.tools.r8.D.e.I0.h:
     java.lang.String origin -> n
     com.android.tools.r8.graph.DexItemFactory factory -> m
     com.android.tools.r8.ir.optimize.lambda.LambdaGroup group -> l
@@ -38617,9 +39000,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.J0.i:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroupId -> com.android.tools.r8.D.e.I0.i:
     com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup() -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger -> com.android.tools.r8.D.e.J0.n:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger -> com.android.tools.r8.D.e.I0.n:
     java.util.Map lambdas -> a
     java.util.Map groups -> b
     com.android.tools.r8.kotlin.Kotlin kotlin -> g
@@ -38635,49 +39018,55 @@
     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):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):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.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):0:0 -> a
+    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$300(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):86 -> a
+    2:2:com.android.tools.r8.ir.optimize.lambda.LambdaGroup getLambdaGroup(com.android.tools.r8.graph.DexType):146:146 -> a
+    2:2:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):408 -> a
+    2:2:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$300(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):86 -> a
+    3:3:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):409:409 -> a
+    3:3:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$300(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):86 -> a
+    4:4:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> a
+    5:5:void invalidateLambda(com.android.tools.r8.graph.DexType):138:138 -> a
+    6:6:void queueForProcessing(com.android.tools.r8.graph.DexEncodedMethod):150:150 -> a
+    6:6:void access$200(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod):86 -> a
+    7:40:void collectGroupCandidates(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):159:192 -> a
+    41:41:boolean lambda$collectGroupCandidates$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):160:160 -> a
+    42:42:int lambda$collectGroupCandidates$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):167:167 -> a
+    43:44:void processMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203:204 -> a
+    45:54:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):215:224 -> a
+    55:75:java.util.Map finalizeLambdaGroups():313:333 -> a
+    55:75:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):228 -> a
+    76:109:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):231:264 -> a
+    110:124:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):263:277 -> a
+    125:125:void lambda$applyLambdaClassMapping$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):232:232 -> a
+    126:126:com.android.tools.r8.ir.optimize.lambda.CodeProcessor lambda$applyLambdaClassMapping$7(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):242:242 -> a
+    127:127:void lambda$applyLambdaClassMapping$8(com.android.tools.r8.graph.DexEncodedMethod):258:258 -> a
+    128:128:boolean lambda$applyLambdaClassMapping$10(com.android.tools.r8.ir.optimize.lambda.LambdaGroup):266:266 -> a
+    129:131:boolean lambda$applyLambdaClassMapping$9(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):268:270 -> a
+    132:136:void analyzeReferencesInProgramClasses(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):282:286 -> a
+    137:156:void analyzeLambdaClassesStructure(java.util.concurrent.ExecutorService):290:309 -> a
+    157:157:void lambda$analyzeLambdaClassesStructure$13(java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):295:295 -> a
+    158:163:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):297:302 -> a
+    164:169:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):300:305 -> a
+    170:170:void invalidateLambda(com.android.tools.r8.graph.DexType):138:138 -> a
+    170:170:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):305 -> a
+    171:177:void removeTrivialLambdaGroups():339:345 -> a
+    178:188:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):353:363 -> a
+    189:202:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):362:375 -> a
+    203:207:java.lang.Object lambda$rewriteLambdaReferences$16(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):365:369 -> a
+    208:214:java.lang.Object lambda$rewriteLambdaReferences$16(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):365:371 -> a
+    215:216:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):379:380 -> a
+    215:216:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
+    217:218:void com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor.accept(com.android.tools.r8.graph.DexTypeList):108:109 -> a
+    217:218:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):380 -> a
+    217:218:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
+    219:241:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):381:403 -> a
+    219:241:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
+    242:242:void com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor.accept(com.android.tools.r8.graph.DexTypeList):108:108 -> a
+    242:242:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):380 -> a
+    242:242:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$100(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> b
-    2:2:void invalidateLambda(com.android.tools.r8.graph.DexType):138:138 -> b
+    2:2:boolean isMergeableLambda(com.android.tools.r8.graph.DexType):142:142 -> b
     3:5:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):163:165 -> b
     6:6:boolean com.android.tools.r8.kotlin.KotlinSyntheticClass.isLambda():48:48 -> b
     6:6:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):165 -> b
@@ -38688,12 +39077,10 @@
     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
+    2:2:void lambda$new$0(com.android.tools.r8.graph.DexType):133:133 -> c
     1:1:java.util.Map access$500(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> d
-    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$1 -> com.android.tools.r8.D.e.I0.j:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalysisStrategy -> com.android.tools.r8.D.e.I0.k:
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> 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>
@@ -38705,7 +39092,7 @@
     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:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy -> com.android.tools.r8.D.e.I0.l:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer optimizationInfoFixer -> l
     java.util.Set typeAffectedValues -> m
@@ -38725,7 +39112,7 @@
     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:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer -> com.android.tools.r8.D.e.I0.m:
     java.util.Map lambdaGroupsClasses -> a
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> b
     boolean $assertionsDisabled -> c
@@ -38736,7 +39123,7 @@
     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:
+com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor -> com.android.tools.r8.D.e.I0.o:
     java.util.function.Consumer onLambdaType -> c
     java.util.function.Predicate isLambdaType -> b
     boolean $assertionsDisabled -> d
@@ -38774,7 +39161,7 @@
     63:63:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
     63:63:void accept(com.android.tools.r8.graph.DexMethodHandle):83 -> a
     64:65:void accept(com.android.tools.r8.graph.DexMethodHandle):83:84 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.ClassInitializerSourceCode -> com.android.tools.r8.D.e.J0.p.a:
+com.android.tools.r8.ir.optimize.lambda.kotlin.ClassInitializerSourceCode -> com.android.tools.r8.D.e.I0.p.a:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> m
     com.android.tools.r8.graph.DexItemFactory factory -> l
@@ -38787,35 +39174,35 @@
     1:1:void lambda$prepareInstructions$3(int,int,com.android.tools.r8.ir.conversion.IRBuilder):62:62 -> c
     1:3:void prepareInstructions():35:37 -> h
     4:35:void prepareInstructions():36:67 -> h
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup -> com.android.tools.r8.D.e.J0.p.g:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup -> com.android.tools.r8.D.e.I0.p.g:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId,com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1):104:104 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId):106:106 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):111:111 -> a
     2:2:com.android.tools.r8.utils.ThrowingConsumer lambdaClassValidator(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):117:117 -> a
     java.lang.String getGroupSuffix() -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1 -> com.android.tools.r8.D.e.J0.p.b:
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.D.e.J0.p.c:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1 -> com.android.tools.r8.D.e.I0.p.b:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.D.e.I0.p.c:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup,com.android.tools.r8.graph.DexItemFactory,java.lang.String):180:180 -> <init>
     1:4:com.android.tools.r8.ir.synthetic.SyntheticSourceCode createInstanceInitializerSourceCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):191:194 -> a
     5:5:com.android.tools.r8.graph.DexField lambda$createInstanceInitializerSourceCode$0(int):195:195 -> a
     1:1:com.android.tools.r8.graph.DexType getSuperClassType():185:185 -> j
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassValidator -> com.android.tools.r8.D.e.J0.p.d:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassValidator -> com.android.tools.r8.D.e.I0.p.d:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):152:152 -> <init>
     1:1:int getInstanceInitializerSize(java.util.List):157:157 -> a
     2:9:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):164:171 -> a
     10:10:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):167:167 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId -> com.android.tools.r8.D.e.J0.p.e:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId -> com.android.tools.r8.D.e.I0.p.e:
     1:1:void <init>(java.lang.String,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):130:130 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup():145:145 -> a
     java.lang.String getLambdaKindDescriptor() -> b
     1:1:boolean equals(java.lang.Object):135:135 -> equals
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.D.e.J0.p.f:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.D.e.I0.p.f:
     com.android.tools.r8.graph.DexMethod objectInitializer -> n
     1:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,java.util.function.IntFunction,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):213:214 -> <init>
     1:6:void lambda$prepareSuperConstructorCall$0(int,com.android.tools.r8.ir.conversion.IRBuilder):221:226 -> b
     7:7:void lambda$prepareSuperConstructorCall$0(int,com.android.tools.r8.ir.conversion.IRBuilder):221:221 -> b
     1:1:void prepareSuperConstructorCall(int):219:219 -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory -> com.android.tools.r8.D.e.J0.p.h:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory -> com.android.tools.r8.D.e.I0.p.h:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory INSTANCE -> m
     1:2:void <clinit>():16:17 -> <clinit>
@@ -38862,29 +39249,29 @@
     32:32:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
     33:33:void validateSuperclass(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):49:49 -> a
     33:33:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup -> com.android.tools.r8.D.e.J0.p.n:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup -> com.android.tools.r8.D.e.I0.p.n:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId,com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1):110:110 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId):112:112 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):117:117 -> a
     2:2:com.android.tools.r8.utils.ThrowingConsumer lambdaClassValidator(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):123:123 -> a
     java.lang.String getGroupSuffix() -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1 -> com.android.tools.r8.D.e.J0.p.i:
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.D.e.J0.p.j:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1 -> com.android.tools.r8.D.e.I0.p.i:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.D.e.I0.p.j:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup,com.android.tools.r8.graph.DexItemFactory,java.lang.String):191:191 -> <init>
     1:7:com.android.tools.r8.ir.synthetic.SyntheticSourceCode createInstanceInitializerSourceCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):202:208 -> a
     8:8:com.android.tools.r8.graph.DexField lambda$createInstanceInitializerSourceCode$0(int):206:206 -> a
     1:1:com.android.tools.r8.graph.DexType getSuperClassType():196:196 -> j
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassValidator -> com.android.tools.r8.D.e.J0.p.k:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassValidator -> com.android.tools.r8.D.e.I0.p.k:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):158:158 -> <init>
     1:1:int getInstanceInitializerSize(java.util.List):163:163 -> a
     2:14:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):170:182 -> a
     15:15:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):178:178 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId -> com.android.tools.r8.D.e.J0.p.l:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId -> com.android.tools.r8.D.e.I0.p.l:
     1:1:void <init>(java.lang.String,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):136:136 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup():151:151 -> a
     java.lang.String getLambdaKindDescriptor() -> b
     1:1:boolean equals(java.lang.Object):141:141 -> equals
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.D.e.J0.p.m:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.D.e.I0.p.m:
     int arity -> n
     com.android.tools.r8.graph.DexMethod lambdaInitializer -> o
     1:4:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,java.util.function.IntFunction,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.ir.code.Position):227:230 -> <init>
@@ -38893,7 +39280,7 @@
     2:7:void lambda$prepareSuperConstructorCall$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):239:244 -> b
     8:8:void lambda$prepareSuperConstructorCall$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):239:239 -> b
     1:3:void prepareSuperConstructorCall(int):235:237 -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroupIdFactory -> com.android.tools.r8.D.e.J0.p.o:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroupIdFactory -> com.android.tools.r8.D.e.I0.p.o:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory INSTANCE -> m
     1:2:void <clinit>():16:17 -> <clinit>
@@ -38947,7 +39334,7 @@
     36:36:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
     37:37:void validateSuperclass(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):49:49 -> a
     37:37:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinInstanceInitializerSourceCode -> com.android.tools.r8.D.e.J0.p.p:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinInstanceInitializerSourceCode -> com.android.tools.r8.D.e.I0.p.p:
     com.android.tools.r8.graph.DexField idField -> l
     java.util.function.IntFunction fieldGenerator -> m
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,java.util.function.IntFunction,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):25:27 -> <init>
@@ -38956,7 +39343,7 @@
     3:3:void lambda$prepareInstructions$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):41:41 -> b
     1:17:void prepareInstructions():32:48 -> h
     void prepareSuperConstructorCall(int) -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaClassValidator -> com.android.tools.r8.D.e.J0.p.q:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaClassValidator -> com.android.tools.r8.D.e.I0.p.q:
     com.android.tools.r8.graph.AppInfoWithSubtyping appInfo -> c
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> b
     com.android.tools.r8.kotlin.Kotlin kotlin -> a
@@ -39038,14 +39425,14 @@
     208:208:void accept(java.lang.Object):47 -> accept
     209:228:void accept(com.android.tools.r8.graph.DexClass):96:115 -> accept
     209:228:void accept(java.lang.Object):47 -> accept
-    229:229:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> accept
+    229:229:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> accept
     229:229:void accept(com.android.tools.r8.graph.DexClass):114 -> accept
     229:229:void accept(java.lang.Object):47 -> accept
     230:234:void accept(com.android.tools.r8.graph.DexClass):117:121 -> accept
     230:234:void accept(java.lang.Object):47 -> accept
     235:235:void accept(com.android.tools.r8.graph.DexClass):73:73 -> accept
     235:235:void accept(java.lang.Object):47 -> accept
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaConstants -> com.android.tools.r8.D.e.J0.p.r:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaConstants -> com.android.tools.r8.D.e.I0.p.r:
     com.android.tools.r8.graph.FieldAccessFlags CAPTURE_FIELD_FLAGS -> j
     com.android.tools.r8.graph.FieldAccessFlags SINGLETON_FIELD_FLAGS -> i
     com.android.tools.r8.graph.MethodAccessFlags CLASS_INITIALIZER_FLAGS -> c
@@ -39058,7 +39445,7 @@
     com.android.tools.r8.graph.MethodAccessFlags BRIDGE_METHOD_FLAGS -> g
     com.android.tools.r8.graph.MethodAccessFlags BRIDGE_METHOD_FLAGS_FIXED -> h
     1:38:void <clinit>():15:52 -> <clinit>
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup -> com.android.tools.r8.D.e.J0.p.s:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup -> com.android.tools.r8.D.e.I0.p.s:
     com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategy -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():19:19 -> <clinit>
@@ -39076,7 +39463,7 @@
     9:9:com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id():27:27 -> a
     9:9:com.android.tools.r8.graph.DexField getCaptureField(com.android.tools.r8.graph.DexItemFactory,int):78 -> a
     10:10:com.android.tools.r8.graph.DexField getCaptureField(com.android.tools.r8.graph.DexItemFactory,int):78:78 -> a
-    11:11:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1239:1239 -> a
+    11:11:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1242:1242 -> a
     11:11:com.android.tools.r8.graph.DexField getCaptureField(com.android.tools.r8.graph.DexItemFactory,int):77 -> a
     1:2:com.android.tools.r8.graph.DexField getSingletonInstanceField(com.android.tools.r8.graph.DexItemFactory,int):46:47 -> b
     3:3:com.android.tools.r8.graph.DexField getSingletonInstanceField(com.android.tools.r8.graph.DexItemFactory,int):46:46 -> b
@@ -39085,7 +39472,7 @@
     1:1:com.android.tools.r8.graph.DexProto createConstructorProto(com.android.tools.r8.graph.DexItemFactory):57 -> c
     2:8:com.android.tools.r8.graph.DexProto createConstructorProto(com.android.tools.r8.graph.DexItemFactory):57:63 -> c
     1:1:com.android.tools.r8.graph.DexField getLambdaIdField(com.android.tools.r8.graph.DexItemFactory):67:67 -> d
-    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1239:1239 -> d
+    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1242:1242 -> d
     2:2:com.android.tools.r8.graph.DexField getLambdaIdField(com.android.tools.r8.graph.DexItemFactory):67 -> d
     1:1:com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id():27:27 -> e
     1:1:java.lang.String getTypePackage():52 -> e
@@ -39096,7 +39483,7 @@
     1:1:com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id():27:27 -> j
     1:1:boolean isStateless():31 -> j
     2:2:boolean isStateless():31:31 -> j
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupClassBuilder -> com.android.tools.r8.D.e.J0.p.t:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupClassBuilder -> com.android.tools.r8.D.e.I0.p.t:
     boolean $assertionsDisabled -> p
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id -> o
     1:1:void <clinit>():36:36 -> <clinit>
@@ -39126,7 +39513,7 @@
     1:25:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():90:114 -> i
     26:44:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():109:127 -> i
     1:3:java.util.Map collectVirtualMethods():135:137 -> l
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupCodeStrategy -> com.android.tools.r8.D.e.J0.p.u:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupCodeStrategy -> com.android.tools.r8.D.e.I0.p.u:
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():35:35 -> <clinit>
@@ -39138,13 +39525,13 @@
     13:20:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):116:123 -> a
     21:21:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     21:21:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):123 -> a
-    22:22:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    22:22:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     22:22:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):122 -> a
     23:28:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):122:127 -> a
     29:31:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):132:134 -> a
     32:36:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):212:216 -> a
     32:36:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):134 -> a
-    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     37:37:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):216 -> a
     37:37:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):134 -> a
     38:47:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):217:226 -> a
@@ -39198,13 +39585,13 @@
     118:121:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):194:197 -> a
     122:122:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     122:122:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):197 -> a
-    123:123:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    123:123:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     123:123:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):196 -> a
     124:130:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):196:202 -> a
     131:134:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):234:237 -> a
     135:135:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     135:135:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):237 -> a
-    136:136:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    136:136:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     136:136:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):236 -> a
     1:5:boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):70:74 -> b
     6:15:boolean isValidInitializerCall(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):96:105 -> b
@@ -39213,7 +39600,7 @@
     17:17:boolean isValidInitializerCall(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):105:105 -> b
     1:4:boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):61:64 -> c
     1:1:boolean isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):79:79 -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId -> com.android.tools.r8.D.e.J0.p.v:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId -> com.android.tools.r8.D.e.I0.p.v:
     com.android.tools.r8.graph.DexProto mainMethodProto -> g
     com.android.tools.r8.graph.ParameterAnnotationsList mainMethodParamAnnotations -> i
     int innerClassAccess -> k
@@ -39236,7 +39623,7 @@
     8:8:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> toString
     8:8:java.lang.String toString():119 -> toString
     9:23:java.lang.String toString():119:133 -> toString
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory -> com.android.tools.r8.D.e.J0.p.w:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory -> com.android.tools.r8.D.e.I0.p.w:
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():22:22 -> <init>
@@ -39312,7 +39699,7 @@
     32:32:void validateStaticFields(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):140 -> b
     33:33:void validateStaticFields(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):140:140 -> b
     34:34:void validateStaticFields(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):136:136 -> b
-    35:35:java.lang.String com.android.tools.r8.graph.DexEncodedField.toSourceString():90:90 -> b
+    35:35:java.lang.String com.android.tools.r8.graph.DexEncodedField.toSourceString():89:89 -> b
     35:35:void validateStaticFields(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):136 -> b
     36:36:void validateStaticFields(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):136:136 -> b
     37:37:void com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError.<init>(java.lang.String):214:214 -> b
@@ -39329,7 +39716,7 @@
     11:11:com.android.tools.r8.graph.DexEncodedMethod validateVirtualMethods(com.android.tools.r8.graph.DexClass):61 -> c
     12:18:com.android.tools.r8.graph.DexEncodedMethod validateVirtualMethods(com.android.tools.r8.graph.DexClass):63:69 -> c
     19:24:boolean hasValidAnnotations(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):90:95 -> c
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaVirtualMethodSourceCode -> com.android.tools.r8.D.e.J0.p.x:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaVirtualMethodSourceCode -> com.android.tools.r8.D.e.I0.p.x:
     com.android.tools.r8.graph.DexItemFactory factory -> l
     java.util.List implMethods -> n
     com.android.tools.r8.graph.DexField idField -> m
@@ -39345,7 +39732,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.K0.a:
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher -> com.android.tools.r8.D.e.J0.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
@@ -39359,10 +39746,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.K0.b:
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockPeephole -> com.android.tools.r8.D.e.J0.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.K0.c:
+com.android.tools.r8.ir.optimize.peepholes.DupDupDupPeephole -> com.android.tools.r8.D.e.J0.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
@@ -39373,7 +39760,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.K0.d:
+com.android.tools.r8.ir.optimize.peepholes.LoadLoadDupPeephole -> com.android.tools.r8.D.e.J0.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
@@ -39382,10 +39769,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.K0.e:
+com.android.tools.r8.ir.optimize.peepholes.Match -> com.android.tools.r8.D.e.J0.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.K0.f:
+com.android.tools.r8.ir.optimize.peepholes.MoveLoadUpPeephole -> com.android.tools.r8.D.e.J0.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
@@ -39406,24 +39793,28 @@
     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.K0.g:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression -> com.android.tools.r8.D.e.J0.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.K0.h:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> com.android.tools.r8.D.e.J0.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
     2:4:boolean lambda$withoutLocalInfo$0(java.util.function.Predicate,com.android.tools.r8.ir.code.Instruction):18:20 -> a
     5:5:void resetNext(com.android.tools.r8.ir.code.InstructionListIterator,int):25:25 -> a
     6:7:int numberOfValuesConsumedFromStack(com.android.tools.r8.ir.code.Instruction):47:48 -> a
-    8:22:void moveInstructionsUpToCurrentPosition(com.android.tools.r8.ir.code.InstructionListIterator,java.util.List):57:71 -> a
-    23:23:boolean lambda$moveInstructionsUpToCurrentPosition$1(java.util.List,com.android.tools.r8.ir.code.Instruction):64:64 -> a
+    8:21:void moveInstructionsUpToCurrentPosition(com.android.tools.r8.ir.code.InstructionListIterator,java.util.List):57:70 -> a
+    22:24:java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate):18:20 -> a
+    22:24:java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate):0 -> a
+    22:24:void moveInstructionsUpToCurrentPosition(com.android.tools.r8.ir.code.InstructionListIterator,java.util.List):70 -> a
+    25:25:void moveInstructionsUpToCurrentPosition(com.android.tools.r8.ir.code.InstructionListIterator,java.util.List):71:71 -> a
+    26:26:boolean lambda$moveInstructionsUpToCurrentPosition$1(java.util.List,com.android.tools.r8.ir.code.Instruction):64:64 -> a
     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.K0.i:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout -> com.android.tools.r8.D.e.J0.i:
     com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[] expressions -> b
     java.util.List instructions -> a
     boolean backwards -> c
@@ -39438,7 +39829,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.K0.j:
+com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.D.e.J0.j:
     java.util.function.Predicate predicate -> a
     int index -> b
     boolean $assertionsDisabled -> c
@@ -39450,14 +39841,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.K0.k:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadPeephole -> com.android.tools.r8.D.e.J0.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.K0.l:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadToDupStorePeephole -> com.android.tools.r8.D.e.J0.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
@@ -39469,7 +39860,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.K0.m:
+com.android.tools.r8.ir.optimize.peepholes.StoreSequenceLoadPeephole -> com.android.tools.r8.D.e.J0.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
@@ -39483,7 +39874,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.K0.n:
+com.android.tools.r8.ir.optimize.peepholes.Wildcard -> com.android.tools.r8.D.e.J0.n:
     java.util.function.Predicate predicate -> a
     int index -> b
     boolean $assertionsDisabled -> c
@@ -39495,7 +39886,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.L0.e:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer -> com.android.tools.r8.D.e.K0.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
@@ -39522,7 +39913,7 @@
     110:113:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):175:178 -> a
     114:127:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):223:236 -> a
     128:134:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):235:241 -> a
-    135:135:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
+    135:135:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
     135:135:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):246 -> a
     136:145:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):246:255 -> a
     146:154:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):341:349 -> a
@@ -39549,27 +39940,27 @@
     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:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     303:303:boolean lambda$analyzeAllValueUsers$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):510 -> a
     304:322:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):428:446 -> a
-    323:323:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    323:323:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     323:323:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):446 -> a
     324:324:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):447:447 -> a
-    325:325:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    325:325:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     325:325:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):446 -> a
     326:327:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):452:453 -> a
     328:328:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):491:491 -> a
-    329:329:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    329:329:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     329:329:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):491 -> a
     330:375:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):491:536 -> a
     376:377:void staticizeCandidates(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):559:560 -> a
     378:381:void setFixupStrategy(java.util.function.BiConsumer):571:574 -> a
     382:385:void cleanFixupStrategy():578:581 -> a
-    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     1:1:boolean lambda$isValidInitCall$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):438 -> b
     2:4:void fixupMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):564:566 -> b
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1 -> com.android.tools.r8.D.e.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$1 -> com.android.tools.r8.D.e.K0.a:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> com.android.tools.r8.D.e.K0.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):584:584 -> <init>
     2:3:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory):586:587 -> <init>
@@ -39586,7 +39977,7 @@
     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:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> com.android.tools.r8.D.e.K0.c:
     java.util.concurrent.atomic.AtomicInteger instancesCreated -> e
     com.android.tools.r8.graph.DexEncodedField singletonField -> b
     java.util.concurrent.atomic.AtomicInteger fieldWrites -> d
@@ -39601,19 +39992,19 @@
     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 -> com.android.tools.r8.D.e.K0.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>():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:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizerGraphLense -> com.android.tools.r8.D.e.K0.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.L0.g:
+com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor -> com.android.tools.r8.D.e.K0.g:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer classStaticizer -> b
     boolean $assertionsDisabled -> i
@@ -39693,11 +40084,11 @@
     172:172:void finalEligibilityCheck():156 -> a
     173:183:void finalEligibilityCheck():156:166 -> a
     184:200:void finalEligibilityCheck():165:181 -> a
-    201:201:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
+    201:201:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
     201:201:void finalEligibilityCheck():183 -> a
     202:213:void finalEligibilityCheck():183:194 -> a
     214:216:void finalEligibilityCheck():193:195 -> a
-    217:217:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
+    217:217:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
     217:217:void finalEligibilityCheck():183 -> a
     218:218:void finalEligibilityCheck():206:206 -> a
     219:219:boolean lambda$finalEligibilityCheck$0(com.android.tools.r8.graph.DexEncodedMethod):148:148 -> a
@@ -39720,28 +40111,28 @@
     280:280:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):278:278 -> a
     280:280:void lambda$rewriteReferences$5(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.StaticGet):326 -> a
     281:286:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):337:342 -> a
-    287:287:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    287:287:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     287:287:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):343 -> a
     288:289:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):344:345 -> a
-    290:290:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    290:290:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     290:290:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):343 -> a
     291:296:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):352:357 -> a
     297:297:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):364:364 -> a
-    298:298:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    298:298:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     298:298:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):364 -> a
     299:303:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):364:368 -> a
     304:321:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):367:384 -> a
     322:327:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):423:428 -> a
-    328:328:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    328:328:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     328:328:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):429 -> a
     329:335:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):430:436 -> a
-    336:336:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    336:336:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     336:336:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):429 -> a
     337:342:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):441:446 -> a
     343:348:void fixupStaticizedFieldReadUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):454:459 -> a
     349:366:void fixupStaticizedFieldReadUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):458:475 -> a
     367:376:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):479:488 -> a
-    377:377:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    377:377:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     377:377:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):488 -> a
     378:385:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):489:496 -> a
     386:386:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> a
@@ -39768,10 +40159,10 @@
     405:406:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):678:679 -> a
     407:407:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):677:677 -> a
     1:1:void removeReferencesToThis(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):304:304 -> b
-    1:1:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> c
+    1:1:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> c
     1:1:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):310 -> c
     2:22:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):310:330 -> c
-    23:23:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> c
+    23:23:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> c
     23:23:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):502 -> c
     23:23:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
     24:37:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):503:516 -> c
@@ -39797,10 +40188,10 @@
     75:75:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
     76:80:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):542:546 -> c
     76:80:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    81:81:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> c
+    81:81:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> c
     81:81:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):310 -> c
-com.android.tools.r8.ir.optimize.string.StringBuilderOptimizationConfiguration -> com.android.tools.r8.D.e.M0.a:
-com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer -> com.android.tools.r8.D.e.M0.g:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizationConfiguration -> com.android.tools.r8.D.e.L0.a:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer -> com.android.tools.r8.D.e.L0.g:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     int numberOfBuildersSimplified -> n
     int numberOfBuildersWithNonDeterministicArg -> l
@@ -39859,15 +40250,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.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$1 -> com.android.tools.r8.D.e.L0.b:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState -> com.android.tools.r8.D.e.L0.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.M0.d:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$DefaultStringBuilderOptimizationConfiguration -> com.android.tools.r8.D.e.L0.d:
     com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer this$0 -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():791:791 -> <clinit>
@@ -39879,7 +40270,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.M0.e:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringBuilderOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.D.e.L0.e:
     com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer this$0 -> b
     com.android.tools.r8.graph.DexType builderType -> a
     boolean $assertionsDisabled -> c
@@ -39894,20 +40285,20 @@
     54:54:boolean com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$DefaultStringBuilderOptimizationConfiguration.isBuilderInit(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):801:801 -> a
     54:54:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):904 -> a
     55:56:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):939:940 -> a
-    57:57:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    57:57:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     57:57:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):940 -> a
     58:59:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):941:942 -> a
-    60:60:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    60:60:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     60:60:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):940 -> a
     61:62:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):945:946 -> a
-    63:63:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    63:63:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     63:63:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):946 -> a
     64:65:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):947:948 -> a
-    66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     66:66:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):946 -> a
     67:67:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):952:952 -> a
     68:68:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):882:882 -> a
-com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis -> com.android.tools.r8.D.e.M0.f:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis -> com.android.tools.r8.D.e.L0.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
@@ -39921,7 +40312,7 @@
     372:372:void <init>(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer,com.android.tools.r8.ir.code.IRCode):206:206 -> <init>
     1:28:java.util.Set findAllLocalBuilders():217:244 -> a
     1:28:java.util.Set access$000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis):191 -> a
-    29:29:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    29:29:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     29:29:java.util.Set findAllLocalBuilders():244 -> a
     29:29:java.util.Set access$000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis):191 -> a
     30:32:java.util.Set collectAllLinkedBuilders(com.android.tools.r8.ir.code.Value):257:259 -> a
@@ -39929,7 +40320,7 @@
     30:32:java.util.Set access$000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis):191 -> a
     33:36:java.util.Set findAllLocalBuilders():245:248 -> a
     33:36:java.util.Set access$000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis):191 -> a
-    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     37:37:java.util.Set findAllLocalBuilders():244 -> a
     37:37:java.util.Set access$000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis):191 -> a
     38:38:java.util.Set findAllLocalBuilders():253:253 -> a
@@ -39945,20 +40336,20 @@
     89:91:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
     92:93:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):362:363 -> a
     92:93:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
-    94:94:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    94:94:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     94:94:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):363 -> a
     94:94:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
     95:99:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):364:368 -> a
     95:99:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
-    100:100:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    100:100:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     100:100:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):368 -> a
     100:100:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
     101:110:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):369:378 -> a
     101:110:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
-    111:111:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    111:111:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     111:111:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):368 -> a
     111:111:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
-    112:112:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    112:112:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     112:112:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):363 -> a
     112:112:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
     113:113:boolean com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$DefaultStringBuilderOptimizationConfiguration.isBuilderInitWithInitialValue(com.android.tools.r8.ir.code.InvokeMethod):813:813 -> a
@@ -39966,30 +40357,30 @@
     113:113:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
     114:120:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):383:389 -> a
     114:120:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
-    121:121:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    121:121:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     121:121:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):389 -> a
     121:121:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
     122:125:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):392:395 -> a
     122:125:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
-    126:126:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    126:126:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     126:126:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):395 -> a
     126:126:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
     127:136:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):396:405 -> a
     127:136:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
-    137:137:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    137:137:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     137:137:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):395 -> a
     137:137:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
-    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     138:138:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):389 -> a
     138:138:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
     139:140:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):408:409 -> a
     139:140:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
-    141:141:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    141:141:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     141:141:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):409 -> a
     141:141:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
     142:151:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):412:421 -> a
     142:151:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
-    152:152:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    152:152:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     152:152:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):409 -> a
     152:152:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
     153:182:java.lang.String extractConstantArgument(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):432:461 -> a
@@ -39998,10 +40389,10 @@
     211:227:void logHistogramOfChains(java.util.List,boolean):548:564 -> a
     228:228:void logHistogramOfChains(java.util.List,boolean):559:559 -> a
     229:230:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):575:576 -> a
-    231:231:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    231:231:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     231:231:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):576 -> a
     232:239:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):577:584 -> a
-    240:240:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    240:240:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     240:240:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):584 -> a
     241:269:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):585:613 -> a
     270:275:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):611:616 -> a
@@ -40009,22 +40400,22 @@
     280:284:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):588:592 -> a
     285:289:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):590:594 -> a
     290:298:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):593:601 -> a
-    299:299:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    299:299:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     299:299:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):584 -> a
     300:301:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):621:622 -> a
     302:302:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     302:302:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):622 -> a
     303:303:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):622:622 -> a
-    304:304:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    304:304:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     304:304:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):576 -> a
     305:314:boolean isToStringOfInterest(java.util.Set,com.android.tools.r8.ir.code.Instruction):628:637 -> a
     305:314:boolean lambda$applyConcatenationResults$1(java.util.Set,com.android.tools.r8.ir.code.Instruction):578 -> a
-    315:315:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    315:315:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     315:315:boolean isToStringOfInterest(java.util.Set,com.android.tools.r8.ir.code.Instruction):637 -> a
     315:315:boolean lambda$applyConcatenationResults$1(java.util.Set,com.android.tools.r8.ir.code.Instruction):578 -> a
     316:332:boolean isToStringOfInterest(java.util.Set,com.android.tools.r8.ir.code.Instruction):638:654 -> a
     316:332:boolean lambda$applyConcatenationResults$1(java.util.Set,com.android.tools.r8.ir.code.Instruction):578 -> a
-    333:333:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    333:333:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     333:333:boolean isToStringOfInterest(java.util.Set,com.android.tools.r8.ir.code.Instruction):637 -> a
     333:333:boolean lambda$applyConcatenationResults$1(java.util.Set,com.android.tools.r8.ir.code.Instruction):578 -> a
     334:379:java.lang.String toCompileTimeString(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState):666:711 -> a
@@ -40032,50 +40423,50 @@
     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():879:879 -> a
+    392:392:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     392:392:void removeTrivialBuilders():734 -> a
     393:399:void removeTrivialBuilders():735:741 -> a
-    400:400:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    400:400:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     400:400:void removeTrivialBuilders():741 -> a
     401:402:void removeTrivialBuilders():741:742 -> a
-    403:403:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    403:403:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     403:403:void removeTrivialBuilders():741 -> a
     404:404:void removeTrivialBuilders():747:747 -> a
-    405:405:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    405:405:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     405:405:void removeTrivialBuilders():747 -> a
     406:412:void removeTrivialBuilders():748:754 -> a
-    413:413:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    413:413:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     413:413:void removeTrivialBuilders():754 -> a
     414:415:void removeTrivialBuilders():754:755 -> a
-    416:416:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    416:416:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     416:416:void removeTrivialBuilders():754 -> a
     417:421:void removeTrivialBuilders():758:762 -> a
-    422:422:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    422:422:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     422:422:void removeTrivialBuilders():762 -> a
     423:424:void removeTrivialBuilders():762:763 -> a
-    425:425:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    425:425:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     425:425:void removeTrivialBuilders():762 -> a
     426:426:void removeTrivialBuilders():767:767 -> a
-    427:427:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    427:427:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     427:427:void removeTrivialBuilders():767 -> a
     428:433:void removeTrivialBuilders():767:772 -> a
-    434:434:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    434:434:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     434:434:void removeTrivialBuilders():767 -> a
     435:435:void removeTrivialBuilders():777:777 -> a
-    436:436:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    436:436:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     436:436:void removeTrivialBuilders():777 -> a
     437:446:void removeTrivialBuilders():778:787 -> a
-    447:447:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    447:447:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     447:447:void removeTrivialBuilders():777 -> a
-    448:448:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    448:448:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     448:448:void removeTrivialBuilders():747 -> a
-    449:449:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    449:449:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     449:449:void removeTrivialBuilders():734 -> a
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$200(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191:191 -> b
     2:40:java.lang.Number extractConstantNumber(com.android.tools.r8.ir.code.Value):469:507 -> b
     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.M0.i:
+com.android.tools.r8.ir.optimize.string.StringOptimizer -> com.android.tools.r8.D.e.L0.i:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> j
@@ -40096,123 +40487,141 @@
     37:37:void lambda$logResult$0(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping,java.lang.Integer):86:86 -> a
     38:39:void lambda$logResult$2(java.lang.Integer,java.lang.Integer):100:101 -> a
     40:40:void lambda$logResult$2(java.lang.Integer,java.lang.Integer):100:100 -> a
-    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():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
-    59:59:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):149 -> a
-    60:65:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):150:155 -> a
-    66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    66:66:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):155 -> a
-    67:75:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):156:164 -> a
-    76:76:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    76:76:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):164 -> a
-    77:79:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):165:167 -> a
-    80:80:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    80:80:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):164 -> a
-    81:96:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):171:186 -> a
-    97:102:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):184:189 -> a
-    103:105:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):188:190 -> a
-    106:106:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    106:106:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):155 -> a
-    107:107:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    107:107:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):149 -> a
-    108:148:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):197:237 -> a
-    149:149:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    149:149:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):237 -> a
-    150:165:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):238:253 -> a
-    166:166:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    166:166:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):253 -> a
-    167:173:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):254:260 -> a
-    174:174:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    174:174:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):253 -> a
-    175:177:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):262:264 -> a
-    178:178:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    178:178:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):264 -> a
-    179:189:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):265:275 -> a
-    190:190:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    190:190:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):264 -> a
-    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):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():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():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
-    362:362:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.stringClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):363:363 -> a
-    362:362:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):429 -> a
-    363:363:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    363:363:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.stringClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):363 -> a
-    363:363:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):429 -> a
-    364:364:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.stringClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability) -> a
-    364:364:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):429 -> a
-    365:365:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):430:430 -> a
-    366:376:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):428:438 -> a
-    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):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
-    391:399:void logHistogramOfNames(com.android.tools.r8.ir.code.DexItemBasedConstString):483:491 -> a
+    41:44:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):133:136 -> a
+    45:45:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
+    45:45:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):137 -> a
+    46:58:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):138:150 -> a
+    59:59:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    59:59:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):150 -> a
+    60:65:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):151:156 -> a
+    66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    66:66:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):156 -> a
+    67:75:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):157:165 -> a
+    76:76:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    76:76:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):165 -> a
+    77:79:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):166:168 -> a
+    80:80:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    80:80:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):165 -> a
+    81:96:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):172:187 -> a
+    97:102:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):185:190 -> a
+    103:105:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):189:191 -> a
+    106:106:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    106:106:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):156 -> a
+    107:107:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    107:107:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):150 -> a
+    108:109:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):195:196 -> a
+    110:110:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    110:110:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):196 -> a
+    111:119:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):197:205 -> a
+    120:125:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):203:208 -> a
+    126:126:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    126:126:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):196 -> a
+    127:167:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):215:255 -> a
+    168:168:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    168:168:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):255 -> a
+    169:180:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):256:267 -> a
+    181:181:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    181:181:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):268 -> a
+    182:183:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):270:271 -> a
+    184:184:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    184:184:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):271 -> a
+    185:190:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):272:277 -> a
+    191:191:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    191:191:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):278 -> a
+    192:192:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    192:192:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):271 -> a
+    193:195:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):280:282 -> a
+    196:196:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    196:196:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):282 -> a
+    197:202:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):283:288 -> a
+    203:203:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    203:203:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):289 -> a
+    204:205:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):292:293 -> a
+    206:206:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    206:206:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):282 -> a
+    207:207:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    207:207:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):255 -> a
+    208:209:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):296:297 -> a
+    210:210:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    210:210:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):297 -> a
+    211:211:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):297:297 -> a
+    212:215:java.lang.Integer lambda$computeTrivialOperationsOnConstString$4(com.android.tools.r8.graph.DexString):218:221 -> a
+    216:216:java.lang.Integer lambda$computeTrivialOperationsOnConstString$10(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):235:235 -> a
+    217:217:java.lang.Integer lambda$computeTrivialOperationsOnConstString$13(com.android.tools.r8.graph.DexString,java.lang.Integer):241:241 -> a
+    218:221:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):304:307 -> a
+    222:222:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
+    222:222:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):309 -> a
+    223:252:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):310:339 -> a
+    253:253:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    253:253:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):339 -> a
+    254:283:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):340:369 -> a
+    284:284:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    284:284:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):374 -> a
+    285:326:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):375:416 -> a
+    327:377:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):397:447 -> a
+    378:378:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.stringClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):363:363 -> a
+    378:378:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):447 -> a
+    379:379: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
+    379:379:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.stringClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):363 -> a
+    379:379:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):447 -> a
+    380:380:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.stringClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):364:364 -> a
+    380:380:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):447 -> a
+    381:381:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):448:448 -> a
+    382:386:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):446:450 -> a
+    387:393:void logHistogramOfNames(com.android.tools.r8.graph.DexString):480:486 -> a
+    387:393:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):451 -> a
+    394:395:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):453:454 -> a
+    396:404:void logHistogramOfNames(com.android.tools.r8.ir.code.DexItemBasedConstString):501:509 -> a
+    396:404:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):456 -> a
+    405:405:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    405:405:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):339 -> a
+    406:407:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):461:462 -> a
+    408:408:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    408:408:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):462 -> a
+    409:412:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):462:465 -> a
+    413:418:void logDeferredNameComputation(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):491:496 -> a
     1:2:void lambda$logResult$1(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping,java.lang.Integer):93:94 -> b
     3:3:void lambda$logResult$1(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping,java.lang.Integer):93:93 -> b
     4:5:void lambda$logResult$3(java.lang.Integer,java.lang.Integer):108:109 -> b
     6:6:void lambda$logResult$3(java.lang.Integer,java.lang.Integer):108:108 -> b
-    7:7:java.lang.Integer lambda$computeTrivialOperationsOnConstString$5(com.android.tools.r8.graph.DexString):207:207 -> b
-    8:8:java.lang.Integer lambda$computeTrivialOperationsOnConstString$11(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):219:219 -> b
-    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():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
+    7:7:java.lang.Integer lambda$computeTrivialOperationsOnConstString$5(com.android.tools.r8.graph.DexString):225:225 -> b
+    8:8:java.lang.Integer lambda$computeTrivialOperationsOnConstString$11(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):237:237 -> b
+    9:9:java.lang.Integer lambda$computeTrivialOperationsOnConstString$15(com.android.tools.r8.graph.DexString,java.lang.Integer):245:245 -> b
+    10:15:void logNameComputation(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):470:475 -> b
+    16:16:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):517:517 -> b
+    17:17:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> b
+    17:17:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):518 -> b
+    18:38:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):519:539 -> b
+    39:82:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):537:580 -> b
     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
-    2:2:java.lang.Integer lambda$computeTrivialOperationsOnConstString$12(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):221:221 -> c
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$14(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):225:225 -> d
-    2:8:void logHistogramOfNames(com.android.tools.r8.graph.DexString):462:468 -> d
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$16(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):229:229 -> e
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$17(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):231:231 -> f
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$18(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):233:233 -> g
-    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.M0.h:
+    83:83:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):580 -> b
+    84:84:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):580:580 -> b
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$6(com.android.tools.r8.graph.DexString):227:227 -> c
+    2:2:java.lang.Integer lambda$computeTrivialOperationsOnConstString$12(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):239:239 -> c
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$14(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):243:243 -> d
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$16(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):247:247 -> e
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$17(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):249:249 -> f
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$18(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):251:251 -> g
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$7(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):229:229 -> h
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):231:231 -> i
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$9(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):233:233 -> j
+com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.D.e.L0.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>
-    1:1:com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration getInstance():575:575 -> a
-    2:17:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):584:599 -> a
-    18:18:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    18:18:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):599 -> a
-    19:19:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):600:600 -> a
-    20:20:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    20:20:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):599 -> a
-    21:22:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):602:603 -> a
-    23:23:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    23:23:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):603 -> a
-    24:24:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):604:604 -> a
-    25:25:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    25:25:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):603 -> a
+    1:1:void <clinit>():587:587 -> <clinit>
+    1:1:void <init>():590:590 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration getInstance():593:593 -> a
+    2:17:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):602:617 -> a
+    18:18:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    18:18:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):617 -> a
+    19:19:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):618:618 -> a
+    20:20:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    20:20:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):617 -> a
+    21:22:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):620:621 -> a
+    23:23:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    23:23:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):621 -> a
+    24:24:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):622:622 -> a
+    25:25:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    25:25:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):621 -> a
 com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator -> com.android.tools.r8.D.f.c:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.List moveExceptionIntervals -> o
@@ -40258,7 +40667,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():1478:1478 -> a
+    124:124:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
     124:124:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):491 -> a
     124:124:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
     125:125:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):491:491 -> a
@@ -40547,16 +40956,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():330:330 -> a
+    1399:1399:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     1399:1399:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2651 -> a
     1399:1399:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2479 -> a
     1400:1406:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2479:2485 -> a
     1407:1458:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2518:2569 -> a
     1459:1465:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2566:2572 -> a
-    1466:1466:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    1466:1466:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     1466:1466:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2572 -> a
     1467:1474:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2572:2579 -> a
-    1475:1475:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    1475:1475:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     1475:1475:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2651 -> a
     1475:1475:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2579 -> a
     1476:1513:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2579:2616 -> a
@@ -40568,7 +40977,7 @@
     1558:1562:boolean argumentsAreAlreadyLinked(com.android.tools.r8.ir.code.Invoke):2869:2873 -> a
     1558:1562:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2764 -> a
     1563:1596:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2765:2798 -> a
-    1597:1598:boolean com.android.tools.r8.ir.code.Value.hasRegisterConstraint():746:747 -> a
+    1597:1598:boolean com.android.tools.r8.ir.code.Value.hasRegisterConstraint():750:751 -> a
     1597:1598:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2800 -> a
     1599:1599:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2801:2801 -> a
     1600:1601:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):2749:2750 -> a
@@ -40663,7 +41072,7 @@
     97:97:void computeLiveRanges():2495 -> c
     97:97:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> c
     97:97:void allocateRegisters():213 -> c
-    98:98:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():1156:1156 -> c
+    98:98:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():1158:1158 -> c
     98:98:void computeLiveRanges():2495 -> c
     98:98:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> c
     98:98:void allocateRegisters():213 -> c
@@ -40671,7 +41080,7 @@
     99:99:void computeLiveRanges():2495 -> c
     99:99:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> c
     99:99:void allocateRegisters():213 -> c
-    100:100:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():1165:1165 -> c
+    100:100:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():1167:1167 -> c
     100:100:void computeLiveRanges():2495 -> c
     100:100:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> c
     100:100:void allocateRegisters():213 -> c
@@ -40684,17 +41093,17 @@
     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():879:879 -> c
+    122:122:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> c
     122:122:void allocateRegisters():227 -> c
     123:127:void allocateRegisters():228:232 -> c
-    128:128:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> c
+    128:128:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> c
     128:128:void allocateRegisters():227 -> c
     129:129:void allocateRegisters():236:236 -> c
     130:135:void clearState():531:536 -> c
     130:135:void allocateRegisters():237 -> c
     136:136:com.android.tools.r8.utils.InternalOptions options():624:624 -> c
     136:136:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1499 -> c
-    137:137:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():1171:1171 -> c
+    137:137:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():1173:1173 -> c
     137:137:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1499 -> c
     138:158:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1502:1522 -> c
     159:171:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1535:1547 -> c
@@ -40703,11 +41112,11 @@
     1:1:int highestUsedRegister():583:583 -> d
     2:2:com.android.tools.r8.utils.InternalOptions options():624:624 -> d
     2:2:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1204:1204 -> d
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1206:1206 -> d
     3:3:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
     4:4:com.android.tools.r8.utils.InternalOptions options():624:624 -> d
     4:4:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1378:1378 -> d
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1380:1380 -> d
     5:5:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
     6:24:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1459 -> d
     25:25:boolean com.android.tools.r8.ir.code.NumberConversion.isLongToIntConversion():52:52 -> d
@@ -40716,13 +41125,13 @@
     27:27:com.android.tools.r8.utils.InternalOptions options():624:624 -> d
     27:27:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
     27:27:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
-    28:28:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1204:1204 -> d
+    28:28:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1206:1206 -> d
     28:28:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
     28:28:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
     29:29:com.android.tools.r8.utils.InternalOptions options():624:624 -> d
     29:29:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
     29:29:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
-    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1378:1378 -> d
+    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1380:1380 -> d
     30:30:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
     30:30:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
     31:49:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1459 -> d
@@ -41124,7 +41533,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():1478:1478 -> a
+    57:57:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> 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
@@ -41145,7 +41554,7 @@
     86:90:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):316:320 -> a
     91:99:void removeArgumentRestores(java.util.Set):332:340 -> a
     100:124:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):347:371 -> a
-    125:125:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():1140:1140 -> a
+    125:125:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():1142:1142 -> a
     125:125:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):371 -> a
     126:131:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):371:376 -> a
     132:136:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):375:379 -> a
@@ -41179,53 +41588,70 @@
 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.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
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):41:41 -> <init>
+    1:1:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexString):46:46 -> a
     2:2:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType):30:30 -> a
-    2:2:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.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
+    2:2:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexString):46 -> a
+    3:9:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexString):49:55 -> a
 com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.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
+    1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):293:294 -> <init>
+    1:9:com.android.tools.r8.graph.CfCode generateCfCode():299:307 -> a
+    10:10:com.android.tools.r8.graph.CfCode generateCfCode():305:305 -> a
+    11:23:com.android.tools.r8.graph.CfCode generateCfCode():302:314 -> a
 com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterThrowRuntimeExceptionCfCodeProvider -> com.android.tools.r8.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
+    1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):324:325 -> <init>
+    1:11:com.android.tools.r8.graph.CfCode generateCfCode():330:340 -> a
+    12:12:com.android.tools.r8.graph.CfCode generateCfCode():338:338 -> a
+    13:22:com.android.tools.r8.graph.CfCode generateCfCode():335:344 -> a
 com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.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
+    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):83:87 -> <init>
+    1:14:com.android.tools.r8.graph.CfCode generateCfCode():92:105 -> a
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):66:66 -> a
+    15:15:com.android.tools.r8.graph.CfCode generateCfCode():108 -> a
+    16:16:com.android.tools.r8.graph.CfCode generateCfCode():108:108 -> a
+    17:17:com.android.tools.r8.graph.CfCode generateCfCode():105:105 -> a
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):66:66 -> a
+    18:18:com.android.tools.r8.graph.CfCode generateCfCode():110 -> a
+    19:30:com.android.tools.r8.graph.CfCode generateCfCode():110:121 -> a
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):66:66 -> a
+    31:31:com.android.tools.r8.graph.CfCode generateCfCode():122 -> a
+    32:43:com.android.tools.r8.graph.CfCode generateCfCode():125:136 -> a
+    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):66:66 -> a
+    44:44:com.android.tools.r8.graph.CfCode generateCfCode():140 -> a
+    45:45:com.android.tools.r8.graph.CfCode generateCfCode():139:139 -> a
+    46:58:com.android.tools.r8.graph.CfCode generateCfCode():136:148 -> a
 com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.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
+    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):167:171 -> <init>
+    1:17:com.android.tools.r8.graph.CfCode generateCfCode():176:192 -> a
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):66:66 -> a
+    18:18:com.android.tools.r8.graph.CfCode generateCfCode():195 -> a
+    19:19:com.android.tools.r8.graph.CfCode generateCfCode():195:195 -> a
+    20:40:com.android.tools.r8.graph.CfCode generateCfCode():192:212 -> a
+    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):66:66 -> a
+    41:41:com.android.tools.r8.graph.CfCode generateCfCode():216 -> a
+    42:42:com.android.tools.r8.graph.CfCode generateCfCode():215:215 -> a
+    43:43:com.android.tools.r8.graph.CfCode generateCfCode():212:212 -> a
+    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):66:66 -> a
+    44:44:com.android.tools.r8.graph.CfCode generateCfCode():218 -> a
+    45:50:com.android.tools.r8.graph.CfCode generateCfCode():220:225 -> a
 com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperConversionCfCodeProvider -> com.android.tools.r8.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
+    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):237:240 -> <init>
+    1:36:com.android.tools.r8.graph.CfCode generateCfCode():245:280 -> a
+    37:37:com.android.tools.r8.graph.CfCode generateCfCode():278:278 -> a
+    38:47:com.android.tools.r8.graph.CfCode generateCfCode():275:284 -> a
 com.android.tools.r8.ir.synthetic.EmulateInterfaceSyntheticCfCodeProvider -> com.android.tools.r8.D.g.i:
     java.util.List extraDispatchCases -> f
     com.android.tools.r8.graph.DexType interfaceType -> c
@@ -46248,7 +46674,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():309:309 -> a
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     27:27:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):116 -> a
     28:28:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):119:119 -> a
     29:40:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):117:128 -> a
@@ -46267,7 +46693,7 @@
     123:127:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):195 -> a
     128:128:void lambda$writeClass$0(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):196:196 -> a
     129:132:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):200:203 -> a
-    133:133:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    133:133:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     133:133:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):204 -> a
     134:138:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):203:207 -> a
     139:146:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):222:229 -> a
@@ -46350,12 +46776,17 @@
     java.lang.Object _value -> b
     java.lang.Object lock -> c
     1:5:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0,java.lang.Object):55:59 -> <init>
-    1:14:java.lang.Object getValue():63:76 -> a
-    15:20:java.lang.Object getValue():69:74 -> a
-    21:21:java.lang.Object getValue():69:69 -> a
     1:1:boolean isInitialized():82:82 -> toString
     1:1:java.lang.String toString():84 -> toString
-    2:2:java.lang.String toString():84:84 -> toString
+    2:15:java.lang.Object getValue():63:76 -> toString
+    2:15:java.lang.String toString():84 -> toString
+    16:16:java.lang.Object getValue():69:69 -> toString
+    16:16:java.lang.String toString():84 -> toString
+    17:17:java.lang.String toString():84:84 -> toString
+    18:18:java.lang.Object getValue():74:74 -> toString
+    18:18:java.lang.String toString():84 -> toString
+    19:19:java.lang.Object getValue():69:69 -> toString
+    19:19:java.lang.String toString():84 -> toString
 com.android.tools.r8.jetbrains.kotlin.TypeCastException -> com.android.tools.r8.G.a.j:
     1:1:void <init>(java.lang.String):11:11 -> <init>
 com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE -> com.android.tools.r8.G.a.k:
@@ -50891,17 +51322,19 @@
     1:1:void <clinit>():765:765 -> <clinit>
     1:7:void <init>(int):783:789 -> <init>
     8:8:void <init>(int):785:785 -> <init>
-    1:1:int size():872:872 -> a
-    2:10:void flushFullBuffer(int):898:906 -> a
-    1:1:void flushLastBuffer():914:914 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> b
-    2:3:byte[] copyArray(byte[],int):835:836 -> b
-    2:3:void flushLastBuffer():916 -> b
-    2:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> b
-    4:18:void flushLastBuffer():917:931 -> b
-    4:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> b
-    19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():828:828 -> b
+    1:9:void flushFullBuffer(int):898:906 -> a
+    10:10:void flushLastBuffer():914:914 -> a
+    10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> a
+    11:12:byte[] copyArray(byte[],int):835:836 -> a
+    11:12:void flushLastBuffer():916 -> a
+    11:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> a
+    13:27:void flushLastBuffer():917:931 -> a
+    13:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> a
+    28:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():828:828 -> a
     1:1:java.lang.String toString():888:888 -> toString
+    2:2:int size():872:872 -> toString
+    2:2:java.lang.String toString():888 -> toString
+    3:3:java.lang.String toString():888:888 -> toString
     1:4:void write(int):794:797 -> write
     5:19:void write(byte[],int,int):802:816 -> write
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream -> com.android.tools.r8.G.b.a.b.b.l:
@@ -52307,7 +52740,7 @@
     9:26:void <init>(com.android.tools.r8.kotlin.Kotlin):60:77 -> <init>
     27:27:void <init>(com.android.tools.r8.kotlin.Kotlin):75:75 -> <init>
     1:1:com.android.tools.r8.graph.DexType lambda$new$0(java.lang.Integer):62:62 -> a
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     2:2:com.android.tools.r8.graph.DexType lambda$new$0(java.lang.Integer):62 -> a
     3:3:int getArity(com.android.tools.r8.graph.DexType):85:85 -> a
     4:4:boolean isFunctionInterface(com.android.tools.r8.graph.DexType):81:81 -> a
@@ -53013,28 +53446,37 @@
     217:217:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):312 -> a
     218:221:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):315:318 -> a
     222:225:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):209:212 -> a
-    226:241:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):337:352 -> a
-    226:241:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    242:242:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):351:351 -> a
-    242:242:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    243:268:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):217:242 -> a
-    269:269: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
-    269:269:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):242 -> a
-    270:284:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):245:259 -> a
-    285:285:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
-    285:285:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):259 -> a
-    286:286:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    286:286:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):260 -> a
-    287:289:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):262:264 -> a
-    290:290:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    290:290:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):264 -> a
-    291:349:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):267:325 -> a
-    350:356:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):324:330 -> a
-    357:357: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
-    357:357:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):329 -> a
-    358:361:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):328:331 -> a
-    362:362:com.android.tools.r8.ir.code.Value lambda$decoupleIdentifierNameStringForInvokeInstruction$2(com.android.tools.r8.ir.code.Value[],com.android.tools.r8.ir.code.Value,long):326:326 -> a
-    363:392:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):361:390 -> a
+    226:227:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):337:338 -> a
+    226:227:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
+    228:229:boolean com.android.tools.r8.naming.IdentifierNameStringUtils.isClassNameComparison(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):147:148 -> a
+    228:229:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):338 -> a
+    228:229:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
+    230:243:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):339:352 -> a
+    230:243:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
+    244:244:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):351:351 -> a
+    244:244:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
+    245:264:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):217:236 -> a
+    265:267:java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate):18:20 -> a
+    265:267:java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate):0 -> a
+    265:267:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):236 -> a
+    268:273:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):237:242 -> a
+    274:274:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> a
+    274:274:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):242 -> a
+    275:289:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):245:259 -> a
+    290:290:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    290:290:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):259 -> a
+    291:291:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    291:291:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):260 -> a
+    292:294:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):262:264 -> a
+    295:295:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    295:295:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):264 -> a
+    296:354:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):267:325 -> a
+    355:361:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):324:330 -> a
+    362:362:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):66:66 -> a
+    362:362:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):329 -> a
+    363:366:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):328:331 -> a
+    367:367:com.android.tools.r8.ir.code.Value lambda$decoupleIdentifierNameStringForInvokeInstruction$2(com.android.tools.r8.ir.code.Value[],com.android.tools.r8.ir.code.Value,long):326:326 -> a
+    368:397:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):361:390 -> a
 com.android.tools.r8.naming.IdentifierNameStringUtils -> com.android.tools.r8.K.D:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():35:35 -> <clinit>
@@ -53047,12 +53489,12 @@
     92:93:boolean isClassNameComparison(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):147:148 -> a
     94:96:boolean isClassNameComparison(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexItemFactory):152:154 -> a
     97:112:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):176:191 -> a
-    113:113:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    113:113:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     113:113:com.android.tools.r8.graph.DexType inferTypeFromConstStringValue(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.Value):283 -> a
     113:113:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):190 -> a
     114:122:com.android.tools.r8.graph.DexType inferTypeFromConstStringValue(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.Value):284:292 -> a
     114:122:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):190 -> a
-    123:123:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    123:123:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     123:123:com.android.tools.r8.graph.DexType inferTypeFromConstStringValue(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.Value):283 -> a
     123:123:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):190 -> a
     124:163:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):197:236 -> a
@@ -53068,19 +53510,19 @@
     212:215:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):240 -> a
     216:218:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):242:244 -> a
     219:221:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):250:252 -> a
-    222:222:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    222:222:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     222:222:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):252 -> a
     223:223:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):253:253 -> a
-    224:224:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    224:224:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     224:224:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):252 -> a
-    225:225:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    225:225:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     225:225:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):158 -> a
     226:228:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):159:161 -> a
-    229:229:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    229:229:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     229:229:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):158 -> a
     230:257:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):300:327 -> a
     230:257:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):264 -> a
-    258:258:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    258:258:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     258:258:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):327 -> a
     258:258:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):264 -> a
     259:263:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):328:332 -> a
@@ -53100,7 +53542,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):1220:1220 -> b
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
     4:4:com.android.tools.r8.graph.DexType inferTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):276 -> b
 com.android.tools.r8.naming.InterfaceMethodNameMinifier -> com.android.tools.r8.K.G:
     com.android.tools.r8.naming.MethodNameMinifier$State minifierState -> d
@@ -53119,10 +53561,10 @@
     3:5:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):406:408 -> a
     6:8:void reserveNamesInInterfaces(java.util.Collection):396:398 -> a
     6:8:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):409 -> a
-    9:10:void com.android.tools.r8.naming.MethodNameMinifier$State.allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):105:106 -> a
+    9:10:void com.android.tools.r8.naming.MethodNameMinifier$State.allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):106:107 -> a
     9:10:void reserveNamesInInterfaces(java.util.Collection):398 -> a
     9:10:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):409 -> a
-    11:11:void com.android.tools.r8.naming.MethodNameMinifier$State.allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):105:105 -> a
+    11:11:void com.android.tools.r8.naming.MethodNameMinifier$State.allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):106:106 -> a
     11:11:void reserveNamesInInterfaces(java.util.Collection):398 -> a
     11:11:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):409 -> a
     12:14:void reserveNamesInInterfaces(java.util.Collection):399:401 -> a
@@ -53132,7 +53574,7 @@
     20:25:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):413:418 -> a
     26:32:void computeReservationFrontiersForAllImplementingClasses():583:589 -> a
     26:32:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):419 -> a
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.MethodNameMinifier$State.getFrontier(com.android.tools.r8.graph.DexType):110:110 -> a
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.MethodNameMinifier$State.getFrontier(com.android.tools.r8.graph.DexType):111:111 -> a
     33:33:void computeReservationFrontiersForAllImplementingClasses():589 -> a
     33:33:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):419 -> a
     34:35:void computeReservationFrontiersForAllImplementingClasses():590:591 -> a
@@ -53154,7 +53596,7 @@
     215:215:com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState lambda$assignNamesToInterfaceMethods$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):426:426 -> a
     216:236:void lambda$assignNamesToInterfaceMethods$1(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):448:468 -> a
     237:240:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):559:562 -> a
-    241:241:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):101:101 -> a
+    241:241:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):102:102 -> a
     241:241:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):562 -> a
     242:245:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):564:567 -> a
     246:246:boolean lambda$assignNewName$2(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):566:566 -> a
@@ -53175,7 +53617,7 @@
     29:30:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):305:306 -> a
     31:31:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State):314:314 -> a
     32:32:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):316:316 -> a
-    33:33:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):93:93 -> a
+    33:33:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):94:94 -> a
     33:33:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):317 -> a
     34:34:void forEachState(java.util.function.BiConsumer):322:322 -> a
     35:35:java.lang.Object lambda$forEachState$5(java.util.function.BiConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):324:324 -> a
@@ -53187,10 +53629,10 @@
     2:2:java.util.Set lambda$appendMethodGroupState$1(com.android.tools.r8.graph.DexMethod):252:252 -> b
     3:3:void reserveName(com.android.tools.r8.graph.DexString):288:288 -> b
     4:7:void lambda$reserveName$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):290:293 -> b
-    8:8:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):93:93 -> b
+    8:8:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):94:94 -> b
     8:8:void lambda$reserveName$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):293 -> b
     9:10:void lambda$reserveName$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):295:296 -> b
-    11:11:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):93:93 -> b
+    11:11:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):94:94 -> b
     11:11:void lambda$reserveName$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):296 -> b
     1:1:java.util.Map access$400(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):240:240 -> c
     1:1:int compareTo(java.lang.Object):240:240 -> compareTo
@@ -53206,14 +53648,14 @@
     1:1:void <init>(com.android.tools.r8.naming.InterfaceMethodNameMinifier,com.android.tools.r8.graph.DexClass):108:108 -> <init>
     2:7:void <init>(com.android.tools.r8.naming.InterfaceMethodNameMinifier,com.android.tools.r8.graph.DexClass):104:109 -> <init>
     1:4:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexMethod):115:118 -> a
-    5:5:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.MethodNameMinifier$State.getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):114:114 -> a
+    5:5:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.MethodNameMinifier$State.getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):115:115 -> a
     5:5:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexMethod):118 -> a
     6:21:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexMethod):126:141 -> a
     22:29:java.lang.Boolean lambda$getReservedName$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):129:136 -> a
     30:30:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):171:171 -> a
     31:31:void lambda$addRenaming$5(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):173:173 -> a
     32:32:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):175:175 -> a
-    33:33:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):101:101 -> a
+    33:33:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):102:102 -> a
     33:33:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):175 -> a
     34:35:void com.android.tools.r8.naming.MethodNamingState.addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):70:71 -> a
     34:35:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):176 -> a
@@ -53221,12 +53663,12 @@
     37:37:java.lang.Object lambda$forAll$6(java.util.function.Consumer,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):184:184 -> a
     38:46:java.lang.Object forAny(java.util.function.Function):190:198 -> a
     1:1:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):149:149 -> b
-    2:2:com.android.tools.r8.naming.MethodReservationState com.android.tools.r8.naming.MethodNameMinifier$State.getReservationState(com.android.tools.r8.graph.DexType):97:97 -> b
+    2:2:com.android.tools.r8.naming.MethodReservationState com.android.tools.r8.naming.MethodNameMinifier$State.getReservationState(com.android.tools.r8.graph.DexType):98:98 -> b
     2:2:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):149 -> b
     3:3:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):150:150 -> b
     4:15:boolean isAvailable(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):156:167 -> b
     16:17:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):159:160 -> b
-    18:18:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):101:101 -> b
+    18:18:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):102:102 -> b
     18:18:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):160 -> b
     19:20:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):161:162 -> b
     21:28:java.lang.Object forChildren(java.util.function.Function):219:226 -> b
@@ -53265,10 +53707,10 @@
     8:8:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod,boolean):235 -> a
     9:10:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod,boolean):235:236 -> a
     11:13:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):270:272 -> a
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     14:14:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):272 -> a
     15:17:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):272:274 -> a
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     18:18:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):274 -> a
     19:20:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):277:278 -> a
     21:21:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):275:275 -> a
@@ -53307,58 +53749,59 @@
     com.android.tools.r8.com.google.common.collect.BiMap reservationStates -> e
     java.util.Map namingStates -> f
     java.util.Map frontiers -> g
-    1:1:void <clinit>():86:86 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):134:134 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):121:140 -> <init>
-    1:1:java.util.Map access$000(com.android.tools.r8.naming.MethodNameMinifier):86:86 -> a
-    2:2:com.android.tools.r8.naming.MethodNamingState access$200(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType):86:86 -> a
-    3:3:com.android.tools.r8.naming.MethodReservationState access$400(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):86:86 -> a
-    4:9:java.util.function.Function getKeyTransform():144:149 -> a
-    10:10:java.lang.Object lambda$getKeyTransform$0(com.android.tools.r8.graph.DexMethod):146:146 -> a
-    11:11:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):173:173 -> a
-    12:14:void reserveNamesInClasses():247:249 -> a
-    12:14:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):174 -> a
-    15:15:void reserveNamesInClasses():247:247 -> a
-    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
+    1:1:void <clinit>():87:87 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):135:135 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):122:141 -> <init>
+    1:1:java.util.Map access$000(com.android.tools.r8.naming.MethodNameMinifier):87:87 -> a
+    2:2:com.android.tools.r8.naming.MethodNamingState access$200(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType):87:87 -> a
+    3:3:com.android.tools.r8.naming.MethodReservationState access$400(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):87:87 -> a
+    4:9:java.util.function.Function getKeyTransform():145:150 -> a
+    10:10:java.lang.Object lambda$getKeyTransform$0(com.android.tools.r8.graph.DexMethod):147:147 -> a
+    11:11:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):174:174 -> a
+    12:14:void reserveNamesInClasses():248:250 -> a
+    12:14:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):175 -> a
+    15:15:void reserveNamesInClasses():248:248 -> a
+    15:15:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):175 -> a
+    16:32:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):176:192 -> a
+    33:35:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):196:198 -> 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
-    64:78:void assignNameToMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState):228:242 -> a
+    36:36:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):198 -> a
+    37:62:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):198:223 -> 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):201:201 -> a
+    64:78:void assignNameToMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState):229:243 -> a
     79:80:void com.android.tools.r8.naming.MethodNamingState.addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):70:71 -> a
-    79:80:void assignNameToMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState):242 -> a
-    81:90:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):274:283 -> a
+    79:80:void assignNameToMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState):243 -> a
+    81:90:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):275:284 -> a
     91:91:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    91:91:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):285 -> a
-    92:92: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:285 -> a
-    93:93:java.lang.Iterable shuffleMethods(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):322:322 -> a
-    93:93: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 -> a
-    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():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
-    2:2:java.lang.Object lambda$getKeyTransform$1(com.android.tools.r8.graph.DexMethod):149:149 -> b
-    3:15:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):255:267 -> b
-    16:16:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):265:265 -> b
-    1:1:com.android.tools.r8.naming.MethodReservationState access$300(com.android.tools.r8.naming.MethodNameMinifier):86:86 -> c
-    1:1:java.util.Map access$500(com.android.tools.r8.naming.MethodNameMinifier):86:86 -> d
-    1:1:com.android.tools.r8.naming.MemberNamingStrategy access$600(com.android.tools.r8.naming.MethodNameMinifier):86:86 -> e
+    91:91:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):286 -> a
+    92:92:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):286:286 -> a
+    93:93:java.lang.Iterable shuffleMethods(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):331:331 -> a
+    93:93:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):286 -> a
+    94:103:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):286:295 -> a
+    104:104:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):293:293 -> a
+    105:105:com.android.tools.r8.naming.MethodReservationState lambda$allocateReservationStateAndReserve$3(com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):282:282 -> a
+    106:120:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):306:320 -> a
+    121:121:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    121:121:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):320 -> a
+    122:124:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):320:322 -> a
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap access$100(com.android.tools.r8.naming.MethodNameMinifier):87:87 -> b
+    2:2:java.lang.Object lambda$getKeyTransform$1(com.android.tools.r8.graph.DexMethod):150:150 -> b
+    3:15:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):256:268 -> b
+    16:16:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):266:266 -> b
+    1:1:com.android.tools.r8.naming.MethodReservationState access$300(com.android.tools.r8.naming.MethodNameMinifier):87:87 -> c
+    1:1:java.util.Map access$500(com.android.tools.r8.naming.MethodNameMinifier):87:87 -> d
+    1:1:com.android.tools.r8.naming.MemberNamingStrategy access$600(com.android.tools.r8.naming.MethodNameMinifier):87:87 -> e
 com.android.tools.r8.naming.MethodNameMinifier$1 -> com.android.tools.r8.K.O:
 com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming -> com.android.tools.r8.K.P:
     java.util.Map renaming -> a
     java.util.Map callSiteRenaming -> b
-    1:1:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.naming.MethodNameMinifier$1):153:153 -> <init>
-    2:4:void <init>(java.util.Map,java.util.Map):159:161 -> <init>
-    1:1:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming empty():165:165 -> a
+    1:1:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.naming.MethodNameMinifier$1):154:154 -> <init>
+    2:4:void <init>(java.util.Map,java.util.Map):160:162 -> <init>
+    1:1:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming empty():166:166 -> a
 com.android.tools.r8.naming.MethodNameMinifier$State -> com.android.tools.r8.K.Q:
     com.android.tools.r8.naming.MethodNameMinifier this$0 -> a
-    1:1:void <init>(com.android.tools.r8.naming.MethodNameMinifier):90:90 -> <init>
-    1:1:com.android.tools.r8.naming.MethodReservationState getReservationState(com.android.tools.r8.graph.DexType):97:97 -> a
+    1:1:void <init>(com.android.tools.r8.naming.MethodNameMinifier):91:91 -> <init>
+    1:1:com.android.tools.r8.naming.MethodReservationState getReservationState(com.android.tools.r8.graph.DexType):98:98 -> a
 com.android.tools.r8.naming.MethodNamingState -> com.android.tools.r8.K.V:
     com.android.tools.r8.naming.MethodNamingState parentNamingState -> d
     boolean $assertionsDisabled -> f
@@ -53668,7 +54111,7 @@
     30:31:java.lang.String lookupPackageName(java.lang.String):125 -> a
     32:32:java.lang.String lookupPackageName(java.lang.String):126:126 -> a
     33:33:void forAllRenamedTypes(java.util.function.Consumer):142:142 -> a
-    34:34:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    34:34:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     34:34:void forAllRenamedTypes(java.util.function.Consumer):142 -> a
     35:37:void forAllRenamedTypes(java.util.function.Consumer):143:145 -> a
     38:51:java.util.Map getRenamedItems(java.lang.Class,java.util.function.Predicate,java.util.function.Function):152:165 -> a
@@ -53708,7 +54151,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):1220:1220 -> a
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     19:19:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.MemberNaming$FieldSignature.toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):163 -> a
     19:19:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):282 -> a
     20:21:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.MemberNaming$FieldSignature.toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):163:164 -> a
@@ -53718,7 +54161,7 @@
     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):558:558 -> a
+    48:48:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> a
     48:48:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):108 -> a
     49:52:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):116:119 -> a
     53:63:void computeDefaultInterfaceMethodMethods():318:328 -> a
@@ -53766,10 +54209,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):558:558 -> a
+    227:227:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> a
     227:227:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):241 -> a
     228:231:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):242:245 -> a
-    232:232:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):558:558 -> a
+    232:232:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> a
     232:232:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):246 -> a
     233:233:void lambda$computeMapping$4(java.util.Deque,com.android.tools.r8.graph.DexType):241:241 -> a
     234:243:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):252:261 -> a
@@ -54309,7 +54752,7 @@
     4:9:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
     10:10:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):190:190 -> a
     10:10:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     11:11:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):189 -> a
     11:11:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
     12:14:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):194:196 -> a
@@ -54323,7 +54766,7 @@
     43:43:void parsedIdentifier(java.lang.String):167:167 -> a
     1:1:com.android.tools.r8.graph.DexType parsedTypeName(java.lang.String):172:172 -> b
     1:1:java.lang.Object parsedTypeName(java.lang.String):153 -> b
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
     2:2:com.android.tools.r8.graph.DexType parsedTypeName(java.lang.String):172 -> b
     2:2:java.lang.Object parsedTypeName(java.lang.String):153 -> b
     3:8:com.android.tools.r8.graph.DexType parsedTypeName(java.lang.String):173:178 -> b
@@ -54341,7 +54784,7 @@
     2:12:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):57 -> a
     13:37:void publicizeType(com.android.tools.r8.graph.DexType):77:101 -> a
     38:44:void publicizeType(com.android.tools.r8.graph.DexType):99:105 -> a
-    45:45:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):558:558 -> a
+    45:45:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> a
     45:45:void publicizeType(com.android.tools.r8.graph.DexType):105 -> a
     46:46:void lambda$publicizeType$0(com.android.tools.r8.graph.DexEncodedField):82:82 -> a
     47:91:boolean publicizeMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):109:153 -> a
@@ -54394,7 +54837,7 @@
     39:53:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):125:139 -> a
     54:54:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):169:169 -> a
     54:54:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):145 -> a
-    55:55:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    55:55:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     55:55:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):169 -> a
     55:55:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):145 -> a
     56:59:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):169:172 -> a
@@ -56380,7 +56823,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):558:558 -> a
+    44:44:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> a
     44:44:void processClass(com.android.tools.r8.graph.DexType):46 -> a
     45:45:void processClass(com.android.tools.r8.graph.DexType):47:47 -> a
 com.android.tools.r8.shaking.AnnotationRemover -> com.android.tools.r8.N.b:
@@ -56547,27 +56990,29 @@
     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
+    84:85:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1033 -> a
+    86:86:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1033:1033 -> a
     87:106:boolean isMethodPinnedDirectlyOrInAncestor(com.android.tools.r8.graph.DexMethod):797:816 -> a
-    87:106:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):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
+    87:106:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1033 -> a
+    107:145:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1034:1072 -> a
     146:147:boolean isPinned(com.android.tools.r8.graph.DexReference):791:792 -> a
     148:149:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):836:837 -> a
     150:151:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLense(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):842:843 -> a
     152:167:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):862:877 -> a
     168:168:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):875:875 -> a
     169:169:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):873:873 -> a
-    170:171:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1078:1079 -> a
+    170:171:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1105:1106 -> a
     170:171:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):871 -> a
-    172:173:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):885:886 -> a
+    172:173:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):910:911 -> a
     172:173:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):869 -> a
-    174: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):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
+    174:177:boolean isInvalidSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):902:905 -> a
+    178:187:boolean interfacesMayHaveDefaultFor(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexMethod):1088:1097 -> a
+    188:209:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1114:1135 -> a
+    210:242:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1134:1166 -> a
+    243:243:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    243:243:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1165 -> a
+    244:270:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1167:1193 -> a
+    271:273:com.android.tools.r8.shaking.AppInfoWithLiveness addEnumValueInfoMaps(java.util.Map):1204:1206 -> a
     1:1:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):538:538 -> b
     2:6:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):593:597 -> b
     7:7:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):351:351 -> b
@@ -56579,28 +57024,31 @@
     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
+    29:37:com.android.tools.r8.graph.DexEncodedMethod validateSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):885:893 -> b
+    38:56:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):919:937 -> b
+    57:112:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):936:991 -> b
+    113:119:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):987:993 -> b
+    120:129:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):986:995 -> b
+    130:130:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):973:973 -> b
+    131:138:com.android.tools.r8.graph.DexEncodedMethod nestAccessLookup(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1000:1007 -> b
+    139:141:com.android.tools.r8.shaking.AppInfoWithLiveness addSwitchMaps(java.util.Map):1197:1199 -> b
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMapFor(com.android.tools.r8.graph.DexField):628:629 -> c
     3:14:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):707:718 -> c
     1:2:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):732:733 -> d
-    3:3:java.lang.String com.android.tools.r8.graph.DexEncodedField.toSourceString():90:90 -> d
+    3:3:java.lang.String com.android.tools.r8.graph.DexEncodedField.toSourceString():89:89 -> d
     3:3:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):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:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():786:786 -> m
     1:2:java.util.Map getEnumValueInfoMapFor(com.android.tools.r8.graph.DexType):623:624 -> q
-    3:4:java.util.Set getPrunedTypes():856:857 -> q
+    3:3:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():634:634 -> q
     1:2:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):682:683 -> r
     3:8:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexType):655:660 -> r
     3:8:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):684 -> r
     9:9:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):684:684 -> r
+    10:11:java.util.Set getPrunedTypes():856:857 -> r
     1:15:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexType):664:678 -> s
     1:2:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):542:543 -> t
     3:3:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):538:538 -> t
@@ -56689,882 +57137,803 @@
     9:11:void lambda$run$0(java.util.List,com.android.tools.r8.graph.DexEncodedMethod):30 -> a
     12:14:void checkItem(com.android.tools.r8.graph.DexDefinition,java.util.List):37:39 -> a
     12:14:void lambda$run$1(java.util.List,com.android.tools.r8.graph.DexEncodedField):31 -> a
-com.android.tools.r8.shaking.Enqueuer -> com.android.tools.r8.N.C:
-    com.android.tools.r8.shaking.Enqueuer$SetWithReason instantiatedInterfaceTypes -> P
-    java.util.Map annotationNodes -> s
-    boolean $assertionsDisabled -> b0
-    com.android.tools.r8.shaking.Enqueuer$SetWithReason targetedMethods -> H
-    java.util.Map deferredAnnotations -> V
-    java.util.Map ruleNodes -> w
-    java.util.Map reachableInstanceFields -> B
-    java.util.Set methodsTargetedByInvokeDynamic -> J
+com.android.tools.r8.shaking.Enqueuer -> com.android.tools.r8.N.A:
+    java.util.Map scopedMethodsForLiveTypes -> R
+    java.util.Map staticInvokes -> m
+    java.util.Set brokenSuperInvokes -> s
+    com.android.tools.r8.shaking.EnqueuerWorklist workList -> K
+    com.android.tools.r8.graph.AppView appView -> e
+    java.util.Map deferredAnnotations -> P
+    com.android.tools.r8.shaking.Enqueuer$SetWithReason liveFields -> H
+    java.util.Set directAndIndirectlyInstantiatedTypes -> A
+    com.android.tools.r8.shaking.Enqueuer$SetWithReason instantiatedInterfaceTypes -> J
+    java.util.Map superInvokeDependencies -> u
+    boolean $assertionsDisabled -> T
     java.util.Set analyses -> c
-    com.android.tools.r8.shaking.Enqueuer$SetWithReason liveTypes -> C
+    com.android.tools.r8.shaking.ProguardClassFilter dontWarnPatterns -> h
+    java.util.Set methodsTargetedByInvokeDynamic -> D
+    com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason liveTypes -> w
+    java.util.Set virtualMethodsTargetedByInvokeDirect -> F
+    java.util.Map virtualInvokes -> i
     java.util.Set instanceFieldsWrittenOutsideEnclosingInstanceInitializers -> o
     java.util.Map superInvokes -> k
-    java.util.Set pendingReflectiveUses -> R
-    java.util.Map virtualTargetsMarkedAsReachable -> S
-    java.util.Map classNodes -> t
+    java.util.Set callSites -> q
+    com.android.tools.r8.shaking.Enqueuer$SetWithReason liveAnnotations -> y
+    com.android.tools.r8.shaking.GraphReporter graphReporter -> S
+    java.util.Set pendingReflectiveUses -> L
+    java.util.Set reportedMissing -> N
+    java.util.Map activeIfRules -> Q
+    java.util.Set liveNonProgramTypes -> x
+    java.util.Map reachableVirtualMethods -> t
+    java.util.Map virtualTargetsMarkedAsReachable -> M
+    com.android.tools.r8.shaking.Enqueuer$SetWithReason liveMethods -> G
+    com.android.tools.r8.utils.InternalOptions options -> f
+    java.util.Map reachableInstanceFields -> v
     com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet -> g
-    java.util.Map activeIfRules -> W
-    java.util.Map reasonInfo -> x
-    com.android.tools.r8.shaking.Enqueuer$SetWithReason liveMethods -> M
-    java.util.Set directAndIndirectlyInstantiatedTypes -> G
-    java.util.Set instantiatedAppServices -> O
+    com.android.tools.r8.graph.FieldAccessInfoCollectionImpl fieldAccessInfoCollection -> n
+    com.android.tools.r8.shaking.Enqueuer$SetWithReason targetedMethods -> B
+    java.util.Set instantiatedAppServices -> I
+    com.android.tools.r8.shaking.Enqueuer$Mode mode -> b
+    java.util.Set bootstrapMethods -> C
+    java.util.Set lambdaMethodsTargetedByInvokeDynamic -> E
+    java.util.Set pinnedItems -> O
+    java.util.Map interfaceInvokes -> j
     java.util.Set staticFieldsWrittenOutsideEnclosingStaticInitializer -> p
     com.android.tools.r8.graph.AppInfoWithSubtyping appInfo -> d
+    com.android.tools.r8.shaking.Enqueuer$SetWithReason instantiatedTypes -> z
     java.util.Map directInvokes -> l
-    com.android.tools.r8.shaking.EnqueuerWorklist workList -> Q
-    boolean forceProguardCompatibility -> a
-    java.util.Set lambdaMethodsTargetedByInvokeDynamic -> K
-    com.android.tools.r8.shaking.Enqueuer$GraphReporter graphReporter -> Y
-    java.util.Set brokenSuperInvokes -> y
-    java.util.Map staticInvokes -> m
-    java.util.Set reportedMissing -> T
-    com.android.tools.r8.graph.AppView appView -> e
-    java.util.Map methodNodes -> u
-    com.android.tools.r8.shaking.Enqueuer$SetWithReason liveFields -> N
-    java.util.Map scopedMethodsForLiveTypes -> X
-    com.android.tools.r8.shaking.ProguardClassFilter dontWarnPatterns -> h
-    java.util.Set liveNonProgramTypes -> D
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> Z
-    com.android.tools.r8.shaking.Enqueuer$SetWithReason liveAnnotations -> E
-    java.util.Map virtualInvokes -> i
-    com.android.tools.r8.shaking.CollectingGraphConsumer verificationGraphConsumer -> a0
-    java.util.Set callSites -> q
-    java.util.Set virtualMethodsTargetedByInvokeDirect -> L
-    java.util.Set pinnedItems -> U
-    java.util.Map reachableVirtualMethods -> z
-    com.android.tools.r8.utils.InternalOptions options -> f
-    java.util.Map fieldNodes -> v
-    java.util.Map superInvokeDependencies -> A
-    com.android.tools.r8.graph.FieldAccessInfoCollectionImpl fieldAccessInfoCollection -> n
-    java.util.Set bootstrapMethods -> I
-    com.android.tools.r8.shaking.Enqueuer$Mode mode -> b
-    com.android.tools.r8.shaking.Enqueuer$SetWithReason instantiatedTypes -> F
-    java.util.Map interfaceInvokes -> j
     java.util.Set identifierNameStrings -> r
-    1:1:void <clinit>():117:117 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):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>
+    boolean forceProguardCompatibility -> a
+    1:1:void <clinit>():103:103 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):293:293 -> <init>
+    2:185:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):131:314 -> <init>
     1:1:void com.android.tools.r8.graph.analysis.EnqueuerAnalysis.processNewlyLiveField(com.android.tools.r8.graph.DexEncodedField):0:0 -> a
-    1:1:void lambda$markInstanceFieldAsLive$21(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1709 -> a
+    1:1:void lambda$markInstanceFieldAsLive$21(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1713 -> a
     boolean lambda$markVirtualMethodAsReachable$25(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod) -> a
     void lambda$newSetWithoutReasonReporter$1(java.lang.Object,com.android.tools.r8.shaking.KeepReason) -> a
-    2:2:com.android.tools.r8.shaking.Enqueuer$GraphReporter access$000(com.android.tools.r8.shaking.Enqueuer):117:117 -> a
-    3:3:void access$1400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):117:117 -> a
-    4:4:com.android.tools.r8.graph.DexProgramClass access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):117:117 -> a
-    5:5:void access$1900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):117:117 -> a
-    6:6:void access$2000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,java.util.function.Function):117:117 -> a
-    7:7:void access$2300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):117:117 -> a
-    8:8:void access$3200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):117:117 -> a
-    9:9:void access$4300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):117:117 -> a
-    10:10:void access$4500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):117:117 -> a
-    11:11:boolean access$500(com.android.tools.r8.shaking.Enqueuer,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):117:117 -> a
-    12:12:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):345:345 -> a
-    13:14:java.util.Set instanceFieldsWrittenOnlyInEnclosingInstanceInitializers():378:379 -> a
-    15:38:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):390:413 -> a
-    39:39:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):409:409 -> a
-    40:53:void lambda$getNonPinnedWrittenFields$0(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):393:406 -> a
-    54:54:void enqueueRootItems(java.util.Map):422:422 -> a
-    55:57:void enqueueRootItem(java.util.Map$Entry):426:428 -> a
-    58:58:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):436:436 -> a
-    58:58:void enqueueRootItem(java.util.Map$Entry):428 -> a
-    59:66:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):441:448 -> a
-    67:67:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
-    67:67:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):449 -> a
-    68:71:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):450:453 -> a
-    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):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
-    95:95:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):469:469 -> a
-    96:98:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):504:506 -> a
-    99:102:boolean registerMethodWithTargetAndContext(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):527:530 -> a
-    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: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 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
+    2:2:com.android.tools.r8.shaking.GraphReporter access$100(com.android.tools.r8.shaking.Enqueuer):103:103 -> a
+    3:3:void access$1500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):103:103 -> a
+    4:4:com.android.tools.r8.graph.DexProgramClass access$1800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):103:103 -> a
+    5:5:void access$2000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103:103 -> a
+    6:6:void access$2100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,java.util.function.Function):103:103 -> a
+    7:7:void access$2200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> a
+    8:8:void access$2400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):103:103 -> a
+    9:9:void access$3300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):103:103 -> a
+    10:10:void access$4100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):103:103 -> a
+    11:11:void access$4400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):103:103 -> a
+    12:12:boolean access$600(com.android.tools.r8.shaking.Enqueuer,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):103:103 -> a
+    13:13:com.android.tools.r8.shaking.GraphReporter getGraphReporter():322:322 -> a
+    14:14:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):326:326 -> a
+    15:22:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):335:342 -> a
+    23:27:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):350:354 -> a
+    23:27:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):342 -> a
+    28:28:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):345:345 -> a
+    29:52:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):371:394 -> a
+    53:53:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):390:390 -> a
+    54:67:void lambda$getNonPinnedWrittenFields$0(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):374:387 -> a
+    68:68:void enqueueRootItems(java.util.Map):403:403 -> a
+    69:71:void enqueueRootItem(java.util.Map$Entry):407:409 -> a
+    72:72:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):417:417 -> a
+    72:72:void enqueueRootItem(java.util.Map$Entry):409 -> a
+    73:80:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):422:429 -> a
+    81:81:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
+    81:81:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):430 -> a
+    82:85:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):431:434 -> a
+    86:90:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):432:436 -> a
+    91:91:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):733:733 -> a
+    91:91:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):436 -> a
+    92:92:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.isExternalizable(com.android.tools.r8.graph.DexType):598:598 -> a
+    92:92:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):733 -> a
+    92:92:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):436 -> a
+    93:108:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):437:452 -> a
+    109:109:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):450:450 -> a
+    110:116:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):456:462 -> a
+    117:120:boolean registerMethodWithTargetAndContext(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):508:511 -> a
+    121:121:java.util.Set lambda$registerMethodWithTargetAndContext$3(com.android.tools.r8.graph.DexMethod):511:511 -> a
+    122:123:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):525:526 -> a
+    124:152:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod,boolean):531:559 -> a
+    153:153:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1038:1038 -> a
+    154:162:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1611:1619 -> a
+    154:162:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1040 -> a
+    163:163:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1618:1618 -> a
+    163:163:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1040 -> a
+    164:164:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1615:1615 -> a
+    164:164:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1040 -> a
+    165:175:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1045:1055 -> a
+    165:175:com.android.tools.r8.graph.DexMethod access$1300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
+    176:191:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1093:1108 -> a
+    192:192:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1105:1105 -> a
+    193:197:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1120:1124 -> a
+    198:198:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    198:198:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1125 -> a
+    199:199:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1128:1128 -> a
+    200:200:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):36:36 -> a
+    200:200:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1128 -> a
+    201:201:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1130:1130 -> a
+    202:226:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1208:1232 -> a
+    202:226:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1131 -> a
+    227:232:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1134:1139 -> a
+    233:236:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1198:1201 -> a
+    233:236:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1157 -> a
+    237:242:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):341:346 -> a
+    237:242:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1201 -> a
+    237:242:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1157 -> a
+    243:243:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1202:1202 -> a
+    243:243:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1157 -> a
+    244:252:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1161:1169 -> a
+    253:263:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):467:477 -> a
+    253:263:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1170 -> a
+    264:264:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
+    264:264:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):478 -> a
+    264:264:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1170 -> a
+    265:265:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):478:478 -> a
+    265:265:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1170 -> a
+    266:278:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1173:1185 -> a
+    279:279:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
+    279:279:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1186 -> a
+    280:280:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1186:1186 -> a
+    281:281:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):495:495 -> a
+    281:281:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1185 -> a
+    282:282:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):417:417 -> a
+    282:282:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):498 -> a
+    282:282:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1185 -> a
+    283:283:boolean lambda$markTypeAsLive$8(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1180:1180 -> a
+    284:287:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexClass):1190:1193 -> a
+    288:288:void enqueueDependentItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexDefinition,java.util.Set):1238:1238 -> a
+    289:289:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1242:1242 -> a
+    290:290:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1248:1248 -> a
+    290:290:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1243 -> a
+    291:291:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1248:1248 -> a
+    291:291:void lambda$markMethodAsLive$34(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):2480 -> a
+    292:300:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1252:1260 -> a
+    301:301:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.annotatedOn(com.android.tools.r8.graph.DexDefinition):24:24 -> a
+    301:301:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1264 -> a
+    302:305:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1265:1268 -> a
+    306:326:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1272:1292 -> a
+    306:326:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):103 -> a
+    327:328:void registerClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1299:1300 -> a
+    327:328:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1293 -> a
+    327:328:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):103 -> a
+    329:329:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1294:1294 -> a
+    329:329:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):103 -> a
+    330:330:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1306:1306 -> a
+    331:355:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1343:1367 -> a
+    356:356:void reportMissingField(com.android.tools.r8.graph.DexField):1385:1385 -> a
+    356:356:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):103 -> a
+    357:357:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    357:357:void reportMissingField(com.android.tools.r8.graph.DexField):1386 -> a
+    357:357:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):103 -> a
+    358:358:void reportMissingField(com.android.tools.r8.graph.DexField):1385:1385 -> a
+    358:358:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):103 -> a
+    359:373:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1423:1437 -> a
+    374:374:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    374:374:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1437 -> a
+    375:375:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1440:1440 -> a
+    376:403:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1484:1511 -> a
+    376:403:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1443 -> a
+    404:404:com.android.tools.r8.shaking.Enqueuer$Mode getMode():318:318 -> a
+    404:404:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1516 -> a
+    404:404:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1443 -> a
+    405:418:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1516:1529 -> a
+    405:418:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1443 -> a
+    419:440:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):1549:1570 -> a
+    419:440:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1530 -> a
+    419:440:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1443 -> a
+    441:450:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1532:1541 -> a
+    441:450:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1443 -> a
+    451:455:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1631:1635 -> a
+    451:455:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1445 -> a
+    456:456:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):36:36 -> a
+    456:456:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1635 -> a
+    456:456:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1445 -> a
+    457:461:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1635:1639 -> a
+    457:461:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1445 -> a
+    462:462:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1447:1447 -> a
+    463:463:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1428:1428 -> a
+    464:464:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexProgramClass.asProgramClass():0:0 -> a
+    464:464:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1428 -> a
+    465:466:void markResolutionAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):1576:1577 -> a
+    467:470:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1579:1582 -> a
+    471:502:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2412:2443 -> a
+    471:502:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1583 -> a
+    503:504:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1584:1585 -> a
+    505:505:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.isLibraryMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):48:48 -> a
+    505:505:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1588 -> a
+    506:506:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1585:1585 -> a
+    507:514:void transitionDefaultMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1598:1605 -> a
+    515:515:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1656:1656 -> a
+    516:536:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1725:1745 -> a
+    516:536:void access$2800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
+    537:537:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> a
+    537:537:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1746 -> a
+    537:537:void access$2800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
+    538:539:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1747:1748 -> a
+    538:539:void access$2800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
+    540:540:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):1786:1786 -> a
+    541:541:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$22(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1818:1818 -> a
+    542:542:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markInstanceFieldAsReachable$24(com.android.tools.r8.graph.DexProgramClass):1839:1839 -> a
+    543:543:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847:1847 -> a
+    544:570:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1855:1881 -> a
+    544:570:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    571:571:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    571:571:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1882 -> a
+    571:571:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    572:609:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1974:2011 -> a
+    572:609:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1886 -> a
+    572:609:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    610:625:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2029:2044 -> a
+    610:625:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2010 -> a
+    610:625:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1886 -> a
+    610:625:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    626:629:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2030:2033 -> a
+    626:629:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2010 -> a
+    626:629:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1886 -> a
+    626:629:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    630:638:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2032:2040 -> a
+    630:638:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2010 -> a
+    630:638:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1886 -> a
+    630:638:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    639:648:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2012:2021 -> a
+    639:648:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1886 -> a
+    639:648:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    649:662:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1887:1900 -> a
+    649:662:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    663:663:java.util.Set com.android.tools.r8.graph.ResolutionResult.lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):33:33 -> a
+    663:663:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1901 -> a
+    663:663:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    664:671:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1902:1909 -> a
+    664:671:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    672:672:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1917:1917 -> a
+    673:673:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    673:673:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1050 -> a
+    673:673:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1917 -> a
+    674:686:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1917:1929 -> a
+    687:687:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1807:1807 -> a
+    687:687:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1937 -> a
+    688:711:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1941:1964 -> a
+    712:718:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1961:1967 -> a
+    719:722:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1944:1947 -> a
+    723:723:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1944:1944 -> a
+    724:735:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2077:2088 -> a
+    736:736:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.targetedBySuperFrom(com.android.tools.r8.graph.DexEncodedMethod):68:68 -> a
+    736:736:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2091 -> a
+    737:756:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2090:2109 -> a
+    757:757:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    757:757:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2109 -> a
+    758:763:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2112:2117 -> a
+    764:771:java.util.Set traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2126:2133 -> a
+    772:779:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2142:2149 -> a
+    780:782:boolean verifyKeptGraph():2154:2156 -> a
+    780:782:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2149 -> a
+    783:783:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2150:2150 -> a
+    784:799:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2163:2178 -> a
+    800:821:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2177:2198 -> a
+    822:827:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):2234:2239 -> a
+    822:827:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2212 -> a
+    828:832:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2213:2217 -> a
+    833:835:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2216:2218 -> a
+    836:836:void lambda$createAppInfo$28(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder,com.android.tools.r8.graph.DexAnnotation):2165:2165 -> a
+    837:837:boolean lambda$createAppInfo$29(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):2170:2170 -> a
+    838:843:java.util.SortedSet toSortedDescriptorSet(java.util.Set):2224:2229 -> a
+    844:870:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2245:2271 -> a
+    871:871:void com.android.tools.r8.shaking.RootSetBuilder.<init>(com.android.tools.r8.graph.AppView,java.util.Collection):106:106 -> a
+    871:871:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2271 -> a
+    872:936:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2272:2336 -> a
+    937:946:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2335:2344 -> a
+    947:951:void unpinLambdaMethods():2350:2354 -> a
+    947:951:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2346 -> a
+    952:952:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2344:2344 -> a
+    953:953:java.util.Set lambda$trace$30(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):2268:2268 -> a
+    954:954:void lambda$trace$31(com.android.tools.r8.graph.DexReference,java.util.Map):2289:2289 -> a
+    955:955:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2294:2294 -> a
+    956:956:boolean com.android.tools.r8.graph.DexType.isDexType():0:0 -> a
+    956:956:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2294 -> a
+    957:957:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2295:2295 -> a
+    958:958:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):495:495 -> a
+    958:958:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2296 -> a
+    959:959:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):417:417 -> a
+    959:959:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):498 -> a
+    959:959:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2296 -> a
+    960:960:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.asDexType():0:0 -> a
+    960:960:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2295 -> a
+    961:989:void markMethodAsKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2359:2387 -> a
+    990:999:void markMethodAsKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2384:2393 -> a
+    1000:1007:void markFieldAsKept(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2399:2406 -> a
+    1008:1019:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2453:2464 -> a
+    1020:1020:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    1020:1020:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2464 -> a
+    1021:1025:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2466:2470 -> a
+    1026:1029:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2469:2472 -> a
+    1030:1047:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2471:2488 -> a
+    1048:1048:void lambda$markMethodAsLive$35(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2488:2488 -> a
+    1049:1051:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2502:2504 -> a
+    1052:1052:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
+    1052:1052:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2504 -> a
+    1053:1053:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2504:2504 -> a
+    1054:1066:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):2848:2860 -> a
     1:1:void com.android.tools.r8.graph.analysis.EnqueuerAnalysis.processNewlyLiveField(com.android.tools.r8.graph.DexEncodedField):0:0 -> b
-    1:1:void lambda$markStaticFieldAsLive$20(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):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
-    5:5:void access$4400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):117:117 -> b
-    6:6:void access$800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):117:117 -> b
-    7:7:boolean isProgramClass(com.android.tools.r8.graph.DexType):350:350 -> b
-    7:7:boolean access$2200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):117 -> b
-    8:15:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):354:361 -> b
-    16:20:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):369:373 -> b
-    16:20:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):361 -> b
-    21:21:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):364:364 -> b
-    22:22:com.android.tools.r8.shaking.Enqueuer$SetWithReason newSetWithoutReasonReporter():418:418 -> b
-    23:23:java.util.Set lambda$registerMethodWithTargetAndContext$3(com.android.tools.r8.graph.DexMethod):530:530 -> b
-    24:24:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):536:536 -> b
-    25:39:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1091:1105 -> b
-    40:40:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1103:1103 -> b
-    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):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):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):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):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):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
-    5:5:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):540:540 -> c
-    6:6:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$10(com.android.tools.r8.graph.DexType):1210:1210 -> c
-    7:7:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1396:1396 -> c
-    8:8:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    8:8:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1397 -> c
-    9:22:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1409:1422 -> c
-    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):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):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):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):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):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):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):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):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):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):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):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):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):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):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):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):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):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):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):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):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
-    4:18:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1438:1452 -> f
-    19:19:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> f
-    19:19:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1452 -> f
-    20:20:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1455:1455 -> f
-    21:48:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1499:1526 -> f
-    21:48:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1458 -> f
-    49:49:com.android.tools.r8.shaking.Enqueuer$Mode getMode():341:341 -> f
-    49:49:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1531 -> f
-    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):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):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):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):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):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
-    2:3:void reportMissingClass(com.android.tools.r8.graph.DexType):1390:1391 -> j
-    4:4:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> j
-    4:4:void reportMissingClass(com.android.tools.r8.graph.DexType):1391 -> j
-    1:1:java.util.Set access$2900(com.android.tools.r8.shaking.Enqueuer):117:117 -> k
-    1:1:java.util.Set access$300(com.android.tools.r8.shaking.Enqueuer):117:117 -> l
-    1:1:java.util.Set access$3000(com.android.tools.r8.shaking.Enqueuer):117:117 -> m
-    1:1:java.util.Set access$3100(com.android.tools.r8.shaking.Enqueuer):117:117 -> n
-    1:1:boolean access$3300(com.android.tools.r8.shaking.Enqueuer):117:117 -> o
-    1:1:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl access$3500(com.android.tools.r8.shaking.Enqueuer):117:117 -> p
-    1:1:java.util.Map access$400(com.android.tools.r8.shaking.Enqueuer):117:117 -> q
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphConsumer access$4600(com.android.tools.r8.shaking.Enqueuer):117:117 -> r
-    1:1:com.android.tools.r8.shaking.EnqueuerWorklist access$600(com.android.tools.r8.shaking.Enqueuer):117:117 -> s
-    1:1:java.util.Map access$700(com.android.tools.r8.shaking.Enqueuer):117:117 -> t
-    1:1:java.util.Map access$900(com.android.tools.r8.shaking.Enqueuer):117:117 -> u
+    1:1:void lambda$markStaticFieldAsLive$20(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1695 -> b
+    2:2:java.util.Map access$1000(com.android.tools.r8.shaking.Enqueuer):103:103 -> b
+    3:3:void access$2600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103:103 -> b
+    4:4:void access$4200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> b
+    5:5:void access$900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> b
+    6:6:boolean isProgramClass(com.android.tools.r8.graph.DexType):331:331 -> b
+    6:6:boolean access$2300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):103 -> b
+    7:8:java.util.Set instanceFieldsWrittenOnlyInEnclosingInstanceInitializers():359:360 -> b
+    9:11:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):485:487 -> b
+    12:12:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):517:517 -> b
+    13:28:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1074:1089 -> b
+    29:29:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1086:1086 -> b
+    30:32:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1112:1114 -> b
+    33:33:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1112:1112 -> b
+    34:34:void lambda$markTypeAsLive$9(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1181:1181 -> b
+    35:35:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$10(com.android.tools.r8.graph.DexType):1192:1192 -> b
+    36:36:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1248:1248 -> b
+    36:36:void lambda$markMethodAsTargeted$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1402 -> b
+    37:65:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1310:1338 -> b
+    66:66:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1379:1379 -> b
+    67:67:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
+    67:67:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1380 -> b
+    68:74:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1646:1652 -> b
+    75:75:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$17(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1657:1657 -> b
+    76:77:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):1790:1791 -> b
+    78:79:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1812:1813 -> b
+    80:80:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
+    80:80:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1814 -> b
+    81:96:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1817:1832 -> b
+    97:97:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1807:1807 -> b
+    97:97:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1834 -> b
+    98:103:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1835:1840 -> b
+    104:104:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$23(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1820:1820 -> b
+    105:105:com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet lambda$markPossibleTargetsAsReachable$26(com.android.tools.r8.graph.DexProgramClass):1928:1928 -> b
+    106:110:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2048:2052 -> b
+    106:110:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2060 -> b
+    111:111:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> b
+    111:111:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2052 -> b
+    111:111:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2060 -> b
+    112:112:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2052:2052 -> b
+    112:112:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2060 -> b
+    113:118:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2051:2056 -> b
+    113:118:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2060 -> b
+    119:125:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2060:2066 -> b
+    126:126:void lambda$trace$33(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2316:2316 -> b
+    127:129:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2528:2530 -> b
+    130:130:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> b
+    130:130:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2531 -> b
+    131:132:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2532:2533 -> b
+    133:139:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2539:2545 -> b
+    133:139:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    140:147:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2634:2641 -> b
+    140:147:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2546 -> b
+    140:147:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    148:156:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2640:2648 -> b
+    148:156:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2546 -> b
+    148:156:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    157:157:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> b
+    157:157:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2652 -> b
+    157:157:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2546 -> b
+    157:157:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    158:161:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2654:2657 -> b
+    158:161:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2546 -> b
+    158:161:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    162:162:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2549:2549 -> b
+    162:162:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    163:168:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2664:2669 -> b
+    163:168:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2550 -> b
+    163:168:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    169:169:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    169:169:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2669 -> b
+    169:169:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2550 -> b
+    169:169:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    170:184:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2670:2684 -> b
+    170:184:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2550 -> b
+    170:184:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    185:211:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2683:2709 -> b
+    185:211:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2550 -> b
+    185:211:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    212:212:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> b
+    212:212:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2711 -> b
+    212:212:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2550 -> b
+    212:212:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    213:257:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2713:2757 -> b
+    213:257:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2550 -> b
+    213:257:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    258:258:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    258:258:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2669 -> b
+    258:258:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2550 -> b
+    258:258:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    259:259:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2553:2553 -> b
+    259:259:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    260:265:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2804:2809 -> b
+    260:265:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2554 -> b
+    260:265:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    266:266:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2557:2557 -> b
+    266:266:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    267:294:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2767:2794 -> b
+    267:294:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2558 -> b
+    267:294:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    295:295:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2561:2561 -> b
+    295:295:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    296:301:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2815:2820 -> b
+    296:301:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2562 -> b
+    296:301:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    302:302:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    302:302:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2820 -> b
+    302:302:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2562 -> b
+    302:302:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    303:315:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2821:2833 -> b
+    303:315:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2562 -> b
+    303:315:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    316:332:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2826:2842 -> b
+    316:332:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2562 -> b
+    316:332:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    333:333:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    333:333:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2820 -> b
+    333:333:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2562 -> b
+    333:333:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    334:348:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2565:2579 -> b
+    334:348:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    349:349:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> b
+    349:349:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2580 -> b
+    349:349:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    350:378:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2581:2609 -> b
+    350:378:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    379:379:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):517:517 -> b
+    379:379:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2609 -> b
+    379:379:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    380:380:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2610:2610 -> b
+    380:380:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    381:381:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):521:521 -> b
+    381:381:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2610 -> b
+    381:381:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    382:396:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2613:2627 -> b
+    382:396:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    397:397:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2625:2625 -> b
+    397:397:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    398:398:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2624:2624 -> b
+    398:398:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    399:399:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> b
+    399:399:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2531 -> b
+    1:1:java.util.Map access$1200(com.android.tools.r8.shaking.Enqueuer):103:103 -> c
+    2:2:void access$4300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> c
+    3:3:com.android.tools.r8.shaking.Enqueuer$SetWithReason newSetWithoutReasonReporter():399:399 -> c
+    4:4:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):521:521 -> c
+    5:5:java.util.Set lambda$handleAnnotation$11(com.android.tools.r8.graph.DexType):1260:1260 -> c
+    6:6:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markMethodAsTargeted$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1398:1398 -> c
+    7:19:void populateInstantiatedTypesCache(com.android.tools.r8.graph.DexProgramClass):1451:1463 -> c
+    20:20:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$18(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1664:1664 -> c
+    21:26:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1699:1704 -> c
+    27:27:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
+    27:27:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1704 -> c
+    28:35:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1706:1713 -> c
+    36:44:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1755:1763 -> c
+    45:46:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.DexEncodedMethod):1063:1064 -> c
+    45:46:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1763 -> c
+    47:47:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1764:1764 -> c
+    48:48:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1069:1069 -> c
+    48:48:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1764 -> c
+    49:51:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1765:1767 -> c
+    52:52:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
+    52:52:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1766 -> c
+    53:57:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1795:1799 -> c
+    58:58:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> c
+    58:58:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1800 -> c
+    59:60:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1802:1803 -> c
+    61:61:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> c
+    61:61:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1800 -> c
+    62:62:java.util.Set lambda$markSuperMethodAsReachable$27(com.android.tools.r8.graph.DexEncodedMethod):2113:2113 -> c
+    63:68:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2510:2515 -> c
+    63:68:void access$3500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
+    69:69:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> c
+    69:69:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2516 -> c
+    69:69:void access$3500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
+    70:72:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2517:2519 -> c
+    70:72:void access$3500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
+    73:73:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2517:2517 -> c
+    73:73:void access$3500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
+    74:74:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2510:2510 -> c
+    74:74:void access$3500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
+    1:1:java.util.Map access$1400(com.android.tools.r8.shaking.Enqueuer):103:103 -> d
+    2:3:java.util.Set staticFieldsWrittenOnlyInEnclosingStaticInitializer():365:366 -> d
+    4:4:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$4(com.android.tools.r8.graph.DexType):1088:1088 -> d
+    5:6:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1656:1657 -> d
+    7:13:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1662:1668 -> d
+    14:15:void registerClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1299:1300 -> d
+    14:15:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1673 -> d
+    16:17:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1678:1679 -> d
+    18:18:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
+    18:18:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1680 -> d
+    19:19:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1683:1683 -> d
+    20:20:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
+    20:20:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1684 -> d
+    21:28:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1688:1695 -> d
+    29:29:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$19(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1666:1666 -> d
+    30:31:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1718:1719 -> d
+    32:32:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
+    32:32:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1719 -> d
+    33:33:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1721:1721 -> d
+    34:38:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2492:2496 -> d
+    39:39:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$36(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2494:2494 -> d
+    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping access$1600(com.android.tools.r8.shaking.Enqueuer):103:103 -> e
+    2:2:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$5(com.android.tools.r8.graph.DexType):1107:1107 -> e
+    3:16:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1392:1405 -> e
+    17:17:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> e
+    17:17:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1405 -> e
+    18:21:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1407:1410 -> e
+    22:22:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2524:2524 -> e
+    22:22:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1411 -> e
+    23:28:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):182:187 -> e
+    23:28:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2524 -> e
+    23:28:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1411 -> e
+    29:29:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2524:2524 -> e
+    29:29:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1411 -> e
+    30:30:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):182:182 -> e
+    30:30:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2524 -> e
+    30:30:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1411 -> e
+    31:31:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$37(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2498:2498 -> e
+    1:1:java.util.Set access$1900(com.android.tools.r8.shaking.Enqueuer):103:103 -> f
+    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$registerMethodWithTargetAndContext$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):510:510 -> f
+    3:3:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$6(com.android.tools.r8.graph.DexType):1114:1114 -> f
+    4:8:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1773:1777 -> f
+    9:9:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1775:1775 -> f
+    10:10:boolean com.android.tools.r8.shaking.KeepReason.isDueToKeepRule():0:0 -> f
+    10:10:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1776 -> f
+    11:12:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1778:1779 -> f
+    13:13:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> f
+    13:13:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1780 -> f
+    1:1:com.android.tools.r8.graph.AppView access$200(com.android.tools.r8.shaking.Enqueuer):103:103 -> g
+    2:2:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$7(com.android.tools.r8.graph.DexType):1137:1137 -> g
+    1:1:java.util.Set access$2500(com.android.tools.r8.shaking.Enqueuer):103:103 -> h
+    2:3:void reportMissingClass(com.android.tools.r8.graph.DexType):1373:1374 -> h
+    4:4:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> h
+    4:4:void reportMissingClass(com.android.tools.r8.graph.DexType):1374 -> h
+    1:1:java.util.Set access$2700(com.android.tools.r8.shaking.Enqueuer):103:103 -> i
+    1:1:com.android.tools.r8.utils.InternalOptions access$2900(com.android.tools.r8.shaking.Enqueuer):103:103 -> j
+    1:1:java.util.Set access$300(com.android.tools.r8.shaking.Enqueuer):103:103 -> k
+    1:1:java.util.Set access$3000(com.android.tools.r8.shaking.Enqueuer):103:103 -> l
+    1:1:java.util.Set access$3100(com.android.tools.r8.shaking.Enqueuer):103:103 -> m
+    1:1:java.util.Set access$3200(com.android.tools.r8.shaking.Enqueuer):103:103 -> n
+    1:1:boolean access$3400(com.android.tools.r8.shaking.Enqueuer):103:103 -> o
+    1:1:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl access$3600(com.android.tools.r8.shaking.Enqueuer):103:103 -> p
+    1:1:java.util.Set access$400(com.android.tools.r8.shaking.Enqueuer):103:103 -> q
+    1:1:java.util.Map access$500(com.android.tools.r8.shaking.Enqueuer):103:103 -> r
+    1:1:com.android.tools.r8.shaking.EnqueuerWorklist access$700(com.android.tools.r8.shaking.Enqueuer):103:103 -> s
+    1:1:java.util.Map access$800(com.android.tools.r8.shaking.Enqueuer):103:103 -> t
 com.android.tools.r8.shaking.Enqueuer$1 -> com.android.tools.r8.N.s:
-    int[] $SwitchMap$com$android$tools$r8$shaking$EnqueuerWorklist$Action$Kind -> b
     int[] $SwitchMap$com$android$tools$r8$graph$DexMethodHandle$MethodHandleType -> a
-    1:1:void <clinit>():2261:2261 -> <clinit>
-    2:2:void <clinit>():990:990 -> <clinit>
+    1:1:void <clinit>():972:972 -> <clinit>
 com.android.tools.r8.shaking.Enqueuer$AnnotationReferenceMarker -> com.android.tools.r8.N.t:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.shaking.Enqueuer this$0 -> d
     com.android.tools.r8.graph.DexItem annotationHolder -> a
     com.android.tools.r8.shaking.KeepReason reason -> c
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.shaking.Enqueuer$1):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:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.shaking.Enqueuer$1):3001:3001 -> <init>
+    2:5:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason):3008:3011 -> <init>
     boolean addCallSite(com.android.tools.r8.graph.DexCallSite) -> a
     boolean addClass(com.android.tools.r8.graph.DexProgramClass) -> a
     boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle) -> a
     boolean addProto(com.android.tools.r8.graph.DexProto) -> a
     boolean addString(com.android.tools.r8.graph.DexString) -> a
-    1:15:boolean addField(com.android.tools.r8.graph.DexField):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>():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):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>():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>():3319:3319 -> <init>
-com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget -> com.android.tools.r8.N.x:
+    1:15:boolean addField(com.android.tools.r8.graph.DexField):3021:3035 -> b
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> b
+    16:16:boolean addField(com.android.tools.r8.graph.DexField):3035 -> b
+    17:29:boolean addField(com.android.tools.r8.graph.DexField):3035:3047 -> b
+    30:39:boolean addMethod(com.android.tools.r8.graph.DexMethod):3055:3064 -> b
+    40:47:boolean addMethod(com.android.tools.r8.graph.DexMethod):3063:3070 -> b
+    48:49:boolean addType(com.android.tools.r8.graph.DexType):3100:3101 -> b
+com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget -> com.android.tools.r8.N.u:
     com.android.tools.r8.graph.DexClass holder -> a
     com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget UNRESOLVED -> c
     com.android.tools.r8.graph.DexEncodedMethod method -> b
     boolean $assertionsDisabled -> d
-    1:3:void <clinit>():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
+    1:3:void <clinit>():2907:2909 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):2918:2921 -> <init>
+    1:1:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget unresolved():2915:2915 -> a
+    1:1:boolean isUnresolved():2925 -> a
+    1:1:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget unresolved():2915:2915 -> b
+    1:2:boolean equals(java.lang.Object):2937:2938 -> equals
+    1:1:int hashCode():2931:2931 -> hashCode
     2:2:int com.android.tools.r8.graph.KeyedDexItem.hashCode():20:20 -> hashCode
-    2:2:int hashCode():2948 -> hashCode
-com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.N.y:
+    2:2:int hashCode():2931 -> hashCode
+com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.N.v:
     com.android.tools.r8.shaking.Enqueuer$Mode WHY_ARE_YOU_KEEPING -> d
     com.android.tools.r8.shaking.Enqueuer$Mode MAIN_DEX_TRACING -> c
     com.android.tools.r8.shaking.Enqueuer$Mode FINAL_TREE_SHAKING -> b
     com.android.tools.r8.shaking.Enqueuer$Mode INITIAL_TREE_SHAKING -> a
-    1:4:void <clinit>():120:123 -> <clinit>
-    1:1:void <init>(java.lang.String,int):119:119 -> <init>
-    1:1:boolean isInitialOrFinalTreeShaking():134:134 -> a
-    2:2:boolean isFinalTreeShaking():130:130 -> a
-    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$ReachableVirtualMethodsSet -> com.android.tools.r8.N.z:
+    1:4:void <clinit>():106:109 -> <clinit>
+    1:1:void <init>(java.lang.String,int):105:105 -> <init>
+    1:1:boolean isInitialOrFinalTreeShaking():120:120 -> a
+    2:2:boolean isFinalTreeShaking():116:116 -> a
+    2:2:boolean isInitialOrFinalTreeShaking():120 -> a
+    1:1:boolean isInitialTreeShaking():112:112 -> b
+    1:1:boolean isTracingMainDex():124:124 -> c
+com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet -> com.android.tools.r8.N.w:
     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:
+    1:4:void <init>():2942:2945 -> <init>
+    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):2942:2942 -> <init>
+    1:1:java.util.Set getMethods():2948:2948 -> a
+    2:2:java.util.Set getReasons(com.android.tools.r8.graph.DexEncodedMethod):2952:2952 -> a
+    2:2:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):2956 -> a
+    3:8:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):2958:2963 -> a
+    9:9:java.util.Set getReasons(com.android.tools.r8.graph.DexEncodedMethod):2952:2952 -> a
+com.android.tools.r8.shaking.Enqueuer$SetWithReason -> com.android.tools.r8.N.x:
     java.util.Set items -> a
     java.util.function.BiConsumer register -> b
-    1:1:void <init>(java.util.function.BiConsumer):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:
+    1:1:void <init>(java.util.function.BiConsumer):2889:2889 -> <init>
+    2:7:void <init>(java.util.function.BiConsumer):2885:2890 -> <init>
+    1:1:java.util.Set access$3800(com.android.tools.r8.shaking.Enqueuer$SetWithReason):2883:2883 -> a
+    2:3:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):2894:2895 -> a
+    4:4:boolean contains(java.lang.Object):2899:2899 -> a
+    5:5:java.util.Set getItems():2903:2903 -> a
+com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason -> com.android.tools.r8.N.y:
+    java.util.Set items -> a
+    boolean $assertionsDisabled -> b
+    1:1:void <clinit>():2865:2865 -> <clinit>
+    1:3:void <init>():2865:2867 -> <init>
+    4:4:void <init>(com.android.tools.r8.shaking.Enqueuer$1):2865:2865 -> <init>
+    1:1:java.util.Set access$3900(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):2865:2865 -> a
+    2:3:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2870:2871 -> a
+    4:4:boolean contains(java.lang.Object):2875:2875 -> a
+    5:5:java.util.Set getItems():2879:2879 -> a
+com.android.tools.r8.shaking.Enqueuer$UseRegistry -> com.android.tools.r8.N.z:
     com.android.tools.r8.shaking.Enqueuer this$0 -> e
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexProgramClass currentHolder -> c
     com.android.tools.r8.graph.DexEncodedMethod currentMethod -> d
-    1:1:void <clinit>():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>
-    2:6:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):586:590 -> <init>
-    1:1:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportClassReferenced(com.android.tools.r8.graph.DexProgramClass):594:594 -> a
-    2:2:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):624:624 -> a
-    3:6:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):628:631 -> a
+    1:1:void <clinit>():562:562 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$1):562:562 -> <init>
+    2:6:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):567:571 -> <init>
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferenced(com.android.tools.r8.graph.DexProgramClass):575:575 -> a
+    2:2:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):605:605 -> a
+    3:6:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):609:612 -> a
     7:7:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    7:7:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):632 -> a
-    8:8:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):634:634 -> a
-    9:27:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):752:770 -> a
+    7:7:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):613 -> a
+    8:8:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):615:615 -> a
+    9:27:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):733:751 -> a
     28:28:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    28:28:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):771 -> a
-    29:31:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):776:778 -> a
-    32:32:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportClassReferenced(com.android.tools.r8.graph.DexProgramClass):594:594 -> a
-    32:32:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):778 -> a
-    33:39:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):778:784 -> a
-    40:40:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):783:783 -> a
-    41:46:boolean registerNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):794:799 -> a
-    47:47:java.lang.Boolean lambda$registerStaticFieldRead$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):833:833 -> a
-    48:48:boolean registerCheckCast(com.android.tools.r8.graph.DexType):910:910 -> a
-    49:49:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):921:921 -> a
+    28:28:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):752 -> a
+    29:31:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):757:759 -> a
+    32:32:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferenced(com.android.tools.r8.graph.DexProgramClass):575:575 -> a
+    32:32:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):759 -> a
+    33:39:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):759:765 -> a
+    40:40:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):764:764 -> a
+    41:46:boolean registerNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):776:781 -> a
+    47:47:java.lang.Boolean lambda$registerStaticFieldRead$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):815:815 -> a
+    48:48:boolean registerCheckCast(com.android.tools.r8.graph.DexType):892:892 -> a
+    49:49:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):903:903 -> a
     50:50:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
-    50:50:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):928 -> a
-    51:55:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):928:932 -> a
-    56:56:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.methodHandleReferencedIn(com.android.tools.r8.graph.DexEncodedMethod):88:88 -> a
-    56:56:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):932 -> a
-    57:60:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):933:936 -> a
-    61:124:void registerCallSite(com.android.tools.r8.graph.DexCallSite):944:1007 -> a
-    125:134:void registerCallSite(com.android.tools.r8.graph.DexCallSite):995:1004 -> a
-    135:135:void registerCallSite(com.android.tools.r8.graph.DexCallSite):998:998 -> a
-    136:175:void registerCallSite(com.android.tools.r8.graph.DexCallSite):992:1031 -> a
-    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):675:675 -> b
-    2:5:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):679:682 -> b
+    50:50:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):910 -> a
+    51:55:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):910:914 -> a
+    56:56:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.methodHandleReferencedIn(com.android.tools.r8.graph.DexEncodedMethod):76:76 -> a
+    56:56:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):914 -> a
+    57:60:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):915:918 -> a
+    61:125:void registerCallSite(com.android.tools.r8.graph.DexCallSite):926:990 -> a
+    126:136:void registerCallSite(com.android.tools.r8.graph.DexCallSite):977:987 -> a
+    137:137:void registerCallSite(com.android.tools.r8.graph.DexCallSite):986:986 -> a
+    138:138:void registerCallSite(com.android.tools.r8.graph.DexCallSite):980:980 -> a
+    139:179:void registerCallSite(com.android.tools.r8.graph.DexCallSite):974:1014 -> a
+    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):656:656 -> b
+    2:5:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):660:663 -> b
     6:6:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    6:6:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):683 -> b
-    7:7:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):685:685 -> b
-    8:26:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):706:724 -> b
+    6:6:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):664 -> b
+    7:7:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):666:666 -> b
+    8:26:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):687:705 -> b
     27:27:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    27:27:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):725 -> b
-    28:39:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):729:740 -> b
-    40:40:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportClassReferenced(com.android.tools.r8.graph.DexProgramClass):594:594 -> b
-    40:40:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):740 -> b
-    41:47:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):740:746 -> b
-    48:48:java.lang.Boolean lambda$registerStaticFieldWrite$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):878:878 -> b
-    49:49:boolean registerConstClass(com.android.tools.r8.graph.DexType):905:905 -> b
-    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):640:640 -> c
-    2:24:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):644:666 -> c
+    27:27:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):706 -> b
+    28:39:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):710:721 -> b
+    40:40:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferenced(com.android.tools.r8.graph.DexProgramClass):575:575 -> b
+    40:40:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):721 -> b
+    41:47:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):721:727 -> b
+    48:48:java.lang.Boolean lambda$registerStaticFieldWrite$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):860:860 -> b
+    49:49:boolean registerConstClass(com.android.tools.r8.graph.DexType):887:887 -> b
+    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):621:621 -> c
+    2:24:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):625:647 -> c
     25:25:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    25:25:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):667 -> c
-    26:26:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):669:669 -> c
-    27:27:boolean registerNewInstance(com.android.tools.r8.graph.DexType):790:790 -> c
+    25:25:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):648 -> c
+    26:26:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):650:650 -> c
+    27:27:boolean registerNewInstance(com.android.tools.r8.graph.DexType):771:771 -> c
     28:28:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.DexEncodedMethod) -> c
-    28:28:boolean registerNewInstance(com.android.tools.r8.graph.DexType):790 -> c
-    29:29:boolean registerNewInstance(com.android.tools.r8.graph.DexType):790:790 -> c
-    30:48:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):807:825 -> c
+    28:28:boolean registerNewInstance(com.android.tools.r8.graph.DexType):771 -> c
+    29:29:boolean registerNewInstance(com.android.tools.r8.graph.DexType):771:771 -> c
+    30:48:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):789:807 -> c
     49:49:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    49:49:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):825 -> c
-    50:56:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):828:834 -> c
-    57:72:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):831:846 -> c
-    1:8:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):603:610 -> d
-    9:19:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):605:615 -> d
+    49:49:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):807 -> c
+    50:56:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):810:816 -> c
+    57:72:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):813:828 -> c
+    1:8:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):584:591 -> d
+    9:19:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):586:596 -> d
     20:20:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    20:20:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):616 -> d
-    21:21:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):618:618 -> d
-    22:27:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):693:698 -> d
+    20:20:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):597 -> d
+    21:21:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):599:599 -> d
+    22:27:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):674:679 -> d
     28:28:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    28:28:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):698 -> d
-    29:29:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):700:700 -> d
-    30:48:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):852:870 -> d
+    28:28:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):679 -> d
+    29:29:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):681:681 -> d
+    30:48:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):834:852 -> d
     49:49:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    49:49:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):870 -> d
-    50:56:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):873:879 -> d
-    57:80:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):876:899 -> d
-    81:81:boolean registerTypeReference(com.android.tools.r8.graph.DexType):915:915 -> d
-    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.D:
+    49:49:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):852 -> d
+    50:56:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):855:861 -> d
+    57:80:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):858:881 -> d
+    81:81:boolean registerTypeReference(com.android.tools.r8.graph.DexType):897:897 -> d
+    1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):580:580 -> e
+    2:11:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):1020:1029 -> e
+    12:12:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):1028:1028 -> e
+com.android.tools.r8.shaking.EnqueuerFactory -> com.android.tools.r8.N.B:
     1:3:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap com.android.tools.r8.shaking.EnqueuerUtils.toImmutableSortedMap(java.util.Map,java.util.Comparator):15:17 -> a
     4:4:com.android.tools.r8.shaking.Enqueuer createForInitialTreeShaking(com.android.tools.r8.graph.AppView):16:16 -> a
     5:5:com.android.tools.r8.shaking.Enqueuer createForFinalTreeShaking(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):21:21 -> a
     1:1:com.android.tools.r8.shaking.Enqueuer createForMainDexTracing(com.android.tools.r8.graph.AppView):25:25 -> b
     2:2:com.android.tools.r8.shaking.Enqueuer createForMainDexTracing(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):30:30 -> b
     1:1:com.android.tools.r8.shaking.Enqueuer createForWhyAreYouKeeping(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):35:35 -> c
-com.android.tools.r8.shaking.EnqueuerWorklist -> com.android.tools.r8.N.H:
+com.android.tools.r8.shaking.EnqueuerWorklist -> com.android.tools.r8.N.M:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Queue queue -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():16:16 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):48:48 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.AppView):46:49 -> <init>
-    1:1:com.android.tools.r8.shaking.EnqueuerWorklist createWorklist(com.android.tools.r8.graph.AppView):53:53 -> a
-    2:2:boolean isEmpty():57:57 -> a
-    3:3:void enqueueMarkReachableDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):65:65 -> a
-    4:4:void enqueueMarkReachableSuperAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):77:77 -> a
-    5:6:void enqueueMarkReachableFieldAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):82:83 -> a
-    7:8:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):87:88 -> a
-    9:10:void enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):93:94 -> a
-    11:12:void enqueueMarkMethodKeptAction(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):98:99 -> a
-    13:14:void enqueueMarkFieldKeptAction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):103:104 -> a
-    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.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.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
-    com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind MARK_REACHABLE_FIELD -> e
-    com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind MARK_METHOD_KEPT -> h
-    com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind MARK_FIELD_KEPT -> i
-    com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind[] $VALUES -> j
-    com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind MARK_REACHABLE_VIRTUAL -> b
-    com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind MARK_REACHABLE_INTERFACE -> c
-    com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind MARK_REACHABLE_DIRECT -> a
-    1:9:void <clinit>():21:29 -> <clinit>
-    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.I:
+    1:1:void <clinit>():15:15 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):162:162 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.AppView):160:163 -> <init>
+    1:1:com.android.tools.r8.shaking.EnqueuerWorklist createWorklist(com.android.tools.r8.graph.AppView):167:167 -> a
+    2:2:boolean isEmpty():171:171 -> a
+    3:3:void enqueueMarkReachableDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):179:179 -> a
+    4:4:void enqueueMarkReachableSuperAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):191:191 -> a
+    5:6:void enqueueMarkReachableFieldAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):196:197 -> a
+    7:8:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):204:205 -> a
+    9:10:void enqueueMarkMethodKeptAction(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):215:216 -> a
+    11:12:void enqueueMarkFieldKeptAction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):220:221 -> a
+    1:1:com.android.tools.r8.shaking.EnqueuerWorklist$Action poll():175:175 -> b
+    2:2:void enqueueMarkReachableInterfaceAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):187:187 -> b
+    3:4:void enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):210:211 -> b
+    1:1:void enqueueMarkReachableVirtualAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):183:183 -> c
+com.android.tools.r8.shaking.EnqueuerWorklist$Action -> com.android.tools.r8.N.C:
+    1:1:void <init>():17:17 -> <init>
+    void run(com.android.tools.r8.shaking.Enqueuer) -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkFieldKeptAction -> com.android.tools.r8.N.D:
+    com.android.tools.r8.graph.DexEncodedField target -> a
+    com.android.tools.r8.shaking.KeepReason reason -> b
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):148:150 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):155:155 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkInstantiatedAction -> com.android.tools.r8.N.E:
+    com.android.tools.r8.graph.DexProgramClass target -> a
+    com.android.tools.r8.shaking.KeepReason reason -> c
+    com.android.tools.r8.graph.DexEncodedMethod context -> b
+    1:4:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):102:105 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):110:110 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodKeptAction -> com.android.tools.r8.N.F:
+    com.android.tools.r8.graph.DexEncodedMethod target -> a
+    com.android.tools.r8.shaking.KeepReason reason -> b
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):133:135 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):140:140 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodLiveAction -> com.android.tools.r8.N.G:
+    com.android.tools.r8.graph.DexEncodedMethod target -> a
+    com.android.tools.r8.shaking.KeepReason reason -> b
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):118:120 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):125:125 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableDirectAction -> com.android.tools.r8.N.H:
+    com.android.tools.r8.shaking.KeepReason reason -> b
+    com.android.tools.r8.graph.DexMethod target -> a
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):25:27 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):32:32 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableFieldAction -> com.android.tools.r8.N.I:
+    com.android.tools.r8.graph.DexEncodedField target -> a
+    com.android.tools.r8.shaking.KeepReason reason -> b
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):85:87 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):92:92 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableInterfaceAction -> com.android.tools.r8.N.J:
+    com.android.tools.r8.shaking.KeepReason reason -> b
+    com.android.tools.r8.graph.DexMethod target -> a
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):55:57 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):62:62 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableSuperAction -> com.android.tools.r8.N.K:
+    com.android.tools.r8.graph.DexEncodedMethod context -> b
+    com.android.tools.r8.graph.DexMethod target -> a
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):70:72 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):77:77 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableVirtualAction -> com.android.tools.r8.N.L:
+    com.android.tools.r8.shaking.KeepReason reason -> b
+    com.android.tools.r8.graph.DexMethod target -> a
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):40:42 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):47:47 -> a
+com.android.tools.r8.shaking.FilteredClassPath -> com.android.tools.r8.N.N:
     com.android.tools.r8.origin.Origin origin -> c
     com.android.tools.r8.position.Position position -> d
     java.nio.file.Path path -> a
@@ -57583,7 +57952,112 @@
     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.J:
+com.android.tools.r8.shaking.GraphReporter -> com.android.tools.r8.N.P:
+    com.android.tools.r8.graph.AppView appView -> a
+    java.util.Map annotationNodes -> d
+    boolean $assertionsDisabled -> j
+    java.util.Map reasonInfo -> i
+    com.android.tools.r8.shaking.CollectingGraphConsumer verificationGraphConsumer -> c
+    java.util.Map classNodes -> e
+    java.util.Map methodNodes -> f
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> b
+    java.util.Map fieldNodes -> g
+    java.util.Map ruleNodes -> h
+    1:1:void <clinit>():45:45 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):59:59 -> <init>
+    2:16:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):52:66 -> <init>
+    1:21:boolean verifyRootedPath(com.android.tools.r8.graph.DexProgramClass):71:91 -> a
+    22:28:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind reportPrecondition(com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode):96:102 -> a
+    29:31:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):117:119 -> a
+    32:37:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexProgramClass):107:112 -> a
+    32:37:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):120 -> a
+    38:38:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):123:123 -> a
+    39:41:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):138:140 -> a
+    42:47:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexEncodedMethod):128:133 -> a
+    42:47:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):141 -> a
+    48:48:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):144:144 -> a
+    49:51:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):159:161 -> a
+    52:57:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexEncodedField):149:154 -> a
+    52:57:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):162 -> a
+    58:58:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):165:165 -> a
+    59:64:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):203:208 -> a
+    65:70:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):212:217 -> a
+    71:74:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):222:225 -> a
+    75:80:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):223:228 -> a
+    81:88:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):233:240 -> a
+    89:95:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):244:250 -> a
+    96:96:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):249:249 -> a
+    97:103:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):255:261 -> a
+    104:104:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):259:259 -> a
+    105:107:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):266:268 -> a
+    108:112:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):296:300 -> a
+    113:113:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):362:362 -> a
+    113:113:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):300 -> a
+    114:115:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):300:301 -> a
+    116:119:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):313:316 -> a
+    120:123:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):320:323 -> a
+    124:127:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):327:330 -> a
+    128:129:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):357:358 -> a
+    128:129:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):330 -> a
+    130:132:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):333:335 -> a
+    133:136:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):339:342 -> a
+    137:137:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):346:346 -> a
+    138:138:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):362:362 -> a
+    138:138:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):347 -> a
+    139:139:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):349:349 -> a
+    140:140:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.shaking.KeepReason):379:379 -> a
+    140:140:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):350 -> a
+    141:143:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):351:353 -> a
+    144:153:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):366:375 -> a
+    154:154:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):383:383 -> a
+    155:155:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode getAnnotationGraphNode(com.android.tools.r8.graph.DexItem):387:387 -> a
+    156:160:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$1(com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):390:394 -> a
+    161:161:com.android.tools.r8.experimental.graphinfo.ClassGraphNode getClassGraphNode(com.android.tools.r8.graph.DexType):399:399 -> a
+    162:162:com.android.tools.r8.experimental.graphinfo.MethodGraphNode getMethodGraphNode(com.android.tools.r8.graph.DexMethod):410:410 -> a
+    163:165:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):413:415 -> a
+    166:166:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    166:166:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):416 -> a
+    167:170:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):416:419 -> a
+    171:171:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    171:171:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):421 -> a
+    172:177:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):421:426 -> a
+    178:178:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    178:178:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):426 -> a
+    179:179:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):426:426 -> a
+    180:180:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):420:420 -> a
+    181:181:com.android.tools.r8.experimental.graphinfo.FieldGraphNode getFieldGraphNode(com.android.tools.r8.graph.DexField):431:431 -> a
+    182:184:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):434:436 -> a
+    185:185:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    185:185:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):438 -> a
+    186:187:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):438:439 -> a
+    188:188:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    188:188:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):440 -> a
+    189:189:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):440:440 -> a
+    190:190:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):437:437 -> a
+    191:211:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode getKeepRuleGraphNode(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):453:473 -> a
+    212:212:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$5(com.android.tools.r8.shaking.ProguardKeepRuleBase,java.util.Set,com.android.tools.r8.shaking.ProguardKeepRuleBase):458:458 -> a
+    213:217:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$6(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardKeepRuleBase):466:470 -> a
+    1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):192:195 -> b
+    5:10:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):193:198 -> b
+    11:15:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):305:309 -> b
+    16:16:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo lambda$getEdgeInfo$0(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):383:383 -> b
+    17:19:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):402:404 -> b
+    20:20:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> b
+    20:20:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):405 -> b
+    21:21:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):405:405 -> b
+    1:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):170:171 -> c
+    3:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> c
+    3:3:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):171 -> c
+    4:8:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):171:175 -> c
+    9:14:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):173:178 -> c
+com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness -> com.android.tools.r8.N.O:
+    com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness INSTANCE -> a
+    1:1:void <clinit>():278:278 -> <clinit>
+    1:1:void <init>():280:280 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():286:286 -> a
+    2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):291:291 -> a
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness access$000():276:276 -> c
+com.android.tools.r8.shaking.IfRuleClassPartEquivalence -> com.android.tools.r8.N.Q:
     1:1:void <init>():11:11 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):11:11 -> a
     2:22:boolean doEquivalent(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardIfRule):15:35 -> a
@@ -57591,7 +58065,7 @@
     23:23:int doHash(java.lang.Object):11:11 -> a
     24:41:int doHash(com.android.tools.r8.shaking.ProguardIfRule):43:60 -> a
     24:41:int doHash(java.lang.Object):11 -> a
-com.android.tools.r8.shaking.IfRuleEvaluator -> com.android.tools.r8.N.K:
+com.android.tools.r8.shaking.IfRuleEvaluator -> com.android.tools.r8.N.S:
     java.util.Set liveTypes -> g
     com.android.tools.r8.shaking.RootSetBuilder rootSetBuilder -> i
     com.android.tools.r8.graph.AppView appView -> a
@@ -57640,7 +58114,7 @@
     203:204:boolean lambda$evaluateIfRuleMembersAndMaterialize$4(java.util.Collection,java.util.Collection,com.android.tools.r8.shaking.ProguardMemberRule):280:281 -> a
     205:230:void materializeIfRule(com.android.tools.r8.shaking.ProguardIfRule,java.util.Set):294:319 -> a
     1:5:void registerClassCapture(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):179:183 -> b
-com.android.tools.r8.shaking.InlineRule -> com.android.tools.r8.N.O:
+com.android.tools.r8.shaking.InlineRule -> com.android.tools.r8.N.W:
     com.android.tools.r8.origin.Origin checkDiscardOrigin -> r
     com.android.tools.r8.shaking.InlineRule$Type type -> q
     boolean $assertionsDisabled -> s
@@ -57682,14 +58156,14 @@
     24:24:com.android.tools.r8.shaking.ProguardCheckDiscardRule asProguardCheckDiscardRule():95:95 -> v
     1:1:com.android.tools.r8.shaking.InlineRule$Type getType():78:78 -> w
     1:1:com.android.tools.r8.shaking.InlineRule$Builder builder():74:74 -> x
-com.android.tools.r8.shaking.InlineRule$1 -> com.android.tools.r8.N.L:
+com.android.tools.r8.shaking.InlineRule$1 -> com.android.tools.r8.N.T:
     1:1:void <init>(com.android.tools.r8.origin.Origin):13:13 -> <init>
-com.android.tools.r8.shaking.InlineRule$Builder -> com.android.tools.r8.N.M:
+com.android.tools.r8.shaking.InlineRule$Builder -> com.android.tools.r8.N.U:
     com.android.tools.r8.shaking.InlineRule$Type type -> o
     1:1:void <init>(com.android.tools.r8.shaking.InlineRule$1):24:24 -> <init>
     2:2:void <init>():27:27 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.InlineRule$Type -> com.android.tools.r8.N.N:
+com.android.tools.r8.shaking.InlineRule$Type -> com.android.tools.r8.N.V:
     com.android.tools.r8.shaking.InlineRule$Type[] $VALUES -> d
     com.android.tools.r8.shaking.InlineRule$Type NEVER -> c
     com.android.tools.r8.shaking.InlineRule$Type FORCE -> b
@@ -57698,92 +58172,86 @@
     2:2:void <clinit>():20:20 -> <clinit>
     1:1:void <init>(java.lang.String,int):20:20 -> <init>
     1:1:com.android.tools.r8.shaking.InlineRule$Type[] values():20:20 -> a
-com.android.tools.r8.shaking.KeepReason -> com.android.tools.r8.N.e0:
+com.android.tools.r8.shaking.KeepReason -> com.android.tools.r8.N.l0:
     1:1:void <init>():17:17 -> <init>
-    com.android.tools.r8.shaking.KeepReason$InstatiatedIn asInstantiatedIn() -> a
-    com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer) -> a
+    com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind() -> a
+    com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter) -> a
     1:1:com.android.tools.r8.shaking.KeepReason invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):40:40 -> a
     2:2:com.android.tools.r8.shaking.KeepReason fieldReferencedIn(com.android.tools.r8.graph.DexEncodedMethod):52:52 -> a
     3:3:com.android.tools.r8.shaking.KeepReason referencedInAnnotation(com.android.tools.r8.graph.DexItem):56:56 -> a
-    com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind() -> b
+    boolean isDueToReflectiveUse() -> b
     1:1:com.android.tools.r8.shaking.KeepReason invokedFromLambdaCreatedIn(com.android.tools.r8.graph.DexEncodedMethod):44:44 -> b
-    boolean isDueToReflectiveUse() -> c
     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.P:
-com.android.tools.r8.shaking.KeepReason$AnnotatedOn -> com.android.tools.r8.N.Q:
+    1:1:com.android.tools.r8.shaking.KeepReason reflectiveUseIn(com.android.tools.r8.graph.DexEncodedMethod):72:72 -> d
+com.android.tools.r8.shaking.KeepReason$1 -> com.android.tools.r8.N.X:
+com.android.tools.r8.shaking.KeepReason$AnnotatedOn -> com.android.tools.r8.N.Y:
     com.android.tools.r8.graph.DexDefinition holder -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():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:
+    1:1:void <clinit>():261:261 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason$1):261:261 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexDefinition):265:266 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():271:271 -> a
+    2:8:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):276:282 -> a
+com.android.tools.r8.shaking.KeepReason$BasedOnOtherMethod -> com.android.tools.r8.N.Z:
     com.android.tools.r8.graph.DexEncodedMethod method -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):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):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():111:111 -> e
-com.android.tools.r8.shaking.KeepReason$InvokedFrom -> com.android.tools.r8.N.U:
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):79:79 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod):83:84 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):95:95 -> a
+com.android.tools.r8.shaking.KeepReason$InstatiatedIn -> com.android.tools.r8.N.a0:
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):99:99 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):102:102 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):99:99 -> a
+    2:2:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():107:107 -> a
+com.android.tools.r8.shaking.KeepReason$InvokedFrom -> com.android.tools.r8.N.b0:
     boolean $assertionsDisabled -> b
-    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:
+    1:1:void <clinit>():150:150 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):150:150 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):153:154 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():159:159 -> a
+com.android.tools.r8.shaking.KeepReason$InvokedFromLambdaCreatedIn -> com.android.tools.r8.N.c0:
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):168:168 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):171:171 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():176:176 -> a
+com.android.tools.r8.shaking.KeepReason$InvokedViaSuper -> com.android.tools.r8.N.d0:
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):116:116 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):119:119 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():124:124 -> a
+com.android.tools.r8.shaking.KeepReason$IsLibraryMethod -> com.android.tools.r8.N.e0:
     com.android.tools.r8.graph.DexType implementer -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason$1):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):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):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.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason$1):221:221 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):226:227 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():233:233 -> a
+    2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):238:238 -> a
+com.android.tools.r8.shaking.KeepReason$MethodHandleReferencedFrom -> com.android.tools.r8.N.f0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):309:309 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):312:312 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():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):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:
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():317:317 -> a
+com.android.tools.r8.shaking.KeepReason$ReachableFromLiveType -> com.android.tools.r8.N.g0:
+    com.android.tools.r8.graph.DexType type -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason$1):202:202 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexType):206:207 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():212:212 -> a
+    2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):217:217 -> a
+com.android.tools.r8.shaking.KeepReason$ReferencedFrom -> com.android.tools.r8.N.h0:
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):185:185 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):188:188 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():193:193 -> a
+com.android.tools.r8.shaking.KeepReason$ReferencedInAnnotation -> com.android.tools.r8.N.i0:
+    com.android.tools.r8.graph.DexItem holder -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItem,com.android.tools.r8.shaking.KeepReason$1):242:242 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexItem):246:247 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():252:252 -> a
+    2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):257:257 -> a
+com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom -> com.android.tools.r8.N.j0:
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):287:287 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):290:290 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():300:300 -> a
+    boolean isDueToReflectiveUse() -> b
+com.android.tools.r8.shaking.KeepReason$TargetedBySuper -> com.android.tools.r8.N.k0:
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):133:133 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):136:136 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():141:141 -> a
+com.android.tools.r8.shaking.L8TreePruner -> com.android.tools.r8.N.m0:
     java.util.List pruned -> c
     java.util.Set emulatedInterfaces -> a
     java.util.Set backports -> b
@@ -57795,7 +58263,7 @@
     9:21:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):48 -> a
     22:22:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):51:51 -> a
     23:31:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):49:57 -> a
-com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis -> com.android.tools.r8.N.h0:
+com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis -> com.android.tools.r8.N.o0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap escapeDebuggingCounters -> c
     java.util.Set nonEscapingClassesWithLibraryMethodOverrides -> b
@@ -57828,7 +58296,7 @@
     6:10:void logResults():159:163 -> b
     11:18:void logResults():160:167 -> b
     19:25:void logResults():164:170 -> b
-com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration -> com.android.tools.r8.N.g0:
+com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration -> com.android.tools.r8.N.n0:
     com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration INSTANCE -> a
     1:1:void <clinit>():181:181 -> <clinit>
     1:1:void <init>():184:184 -> <init>
@@ -57836,7 +58304,7 @@
     2:2:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):196:196 -> a
     3:14:boolean isTrivialInitializerInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):209:220 -> a
     3:14:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):197 -> a
-com.android.tools.r8.shaking.MainDexClasses -> com.android.tools.r8.N.k0:
+com.android.tools.r8.shaking.MainDexClasses -> com.android.tools.r8.N.r0:
     java.util.Set classes -> c
     boolean $assertionsDisabled -> e
     java.util.Set roots -> a
@@ -57860,8 +58328,8 @@
     1:1:java.util.Set getDependencies():87:87 -> b
     1:1:java.util.Set getRoots():83:83 -> c
     1:2:boolean isEmpty():78:79 -> d
-com.android.tools.r8.shaking.MainDexClasses$1 -> com.android.tools.r8.N.i0:
-com.android.tools.r8.shaking.MainDexClasses$Builder -> com.android.tools.r8.N.j0:
+com.android.tools.r8.shaking.MainDexClasses$1 -> com.android.tools.r8.N.p0:
+com.android.tools.r8.shaking.MainDexClasses$Builder -> com.android.tools.r8.N.q0:
     java.util.Set dependencies -> c
     java.util.Set roots -> b
     com.android.tools.r8.graph.AppInfo appInfo -> a
@@ -57881,7 +58349,7 @@
     4:5:com.android.tools.r8.shaking.MainDexClasses$Builder addRoot(com.android.tools.r8.graph.DexType):32:33 -> b
     1:1:boolean contains(com.android.tools.r8.graph.DexType):50:50 -> c
     1:2:boolean isProgramClass(com.android.tools.r8.graph.DexType):58:59 -> d
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r8.N.p0:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r8.N.w0:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector codeDirectReferenceCollector -> b
     java.util.function.Consumer consumer -> d
     com.android.tools.r8.graph.AppInfoWithSubtyping appInfo -> c
@@ -57904,8 +58372,8 @@
     20:20:boolean hasReferencesOutsideFromCode(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):81:81 -> a
     21:25:void lambda$hasReferencesOutsideFromCode$2(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$BooleanBox,com.android.tools.r8.graph.DexType):71:75 -> a
     26:29:void traceMethodDirectDependencies(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):89:92 -> a
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1 -> com.android.tools.r8.N.l0:
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.N.m0:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1 -> com.android.tools.r8.N.s0:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.N.t0:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> a
     1:1:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer):172:172 -> <init>
     2:2:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):172:172 -> <init>
@@ -57917,11 +58385,11 @@
     1:2:boolean addField(com.android.tools.r8.graph.DexField):182:183 -> b
     3:4:boolean addMethod(com.android.tools.r8.graph.DexMethod):189:190 -> b
     5:5:boolean addType(com.android.tools.r8.graph.DexType):210:210 -> b
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$BooleanBox -> com.android.tools.r8.N.n0:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$BooleanBox -> com.android.tools.r8.N.u0:
     boolean value -> a
     1:2:void <init>():59:60 -> <init>
     3:3:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):59:59 -> <init>
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> com.android.tools.r8.N.o0:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> com.android.tools.r8.N.v0:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> c
     1:1:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):96:96 -> <init>
     2:3:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.DexItemFactory):98:99 -> <init>
@@ -57938,7 +58406,7 @@
     1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):104:104 -> e
     2:3:boolean registerFieldAccess(com.android.tools.r8.graph.DexField):154:155 -> e
     1:2:boolean registerInvoke(com.android.tools.r8.graph.DexMethod):128:129 -> f
-com.android.tools.r8.shaking.MainDexListBuilder -> com.android.tools.r8.N.q0:
+com.android.tools.r8.shaking.MainDexListBuilder -> com.android.tools.r8.N.x0:
     java.util.Map annotationTypeContainEnum -> c
     com.android.tools.r8.graph.AppInfoWithSubtyping appInfo -> b
     boolean $assertionsDisabled -> f
@@ -57988,29 +58456,29 @@
     14:14:void traceRuntimeAnnotationsWithEnumForMainDex():78:78 -> c
     15:37:void com.android.tools.r8.graph.DexClass.forEachAnnotation(java.util.function.Consumer):359:381 -> c
     15:37:void traceRuntimeAnnotationsWithEnumForMainDex():78 -> c
-com.android.tools.r8.shaking.MemberValuePropagationRule -> com.android.tools.r8.N.u0:
+com.android.tools.r8.shaking.MemberValuePropagationRule -> com.android.tools.r8.N.B0:
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type type -> q
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.shaking.MemberValuePropagationRule$1):11:11 -> <init>
     2:5:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.MemberValuePropagationRule$Type):61:64 -> <init>
     1:5:java.lang.String typeString():77:81 -> u
     1:1:com.android.tools.r8.shaking.MemberValuePropagationRule$Type getType():72:72 -> v
     1:1:com.android.tools.r8.shaking.MemberValuePropagationRule$Builder builder():68:68 -> w
-com.android.tools.r8.shaking.MemberValuePropagationRule$1 -> com.android.tools.r8.N.r0:
+com.android.tools.r8.shaking.MemberValuePropagationRule$1 -> com.android.tools.r8.N.y0:
     int[] $SwitchMap$com$android$tools$r8$shaking$MemberValuePropagationRule$Type -> a
     1:1:void <clinit>():77:77 -> <clinit>
-com.android.tools.r8.shaking.MemberValuePropagationRule$Builder -> com.android.tools.r8.N.s0:
+com.android.tools.r8.shaking.MemberValuePropagationRule$Builder -> com.android.tools.r8.N.z0:
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type type -> o
     1:1:void <init>(com.android.tools.r8.shaking.MemberValuePropagationRule$1):17:17 -> <init>
     2:2:void <init>():21:21 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.MemberValuePropagationRule$Type -> com.android.tools.r8.N.t0:
+com.android.tools.r8.shaking.MemberValuePropagationRule$Type -> com.android.tools.r8.N.A0:
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type[] $VALUES -> b
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type NEVER -> a
     1:1:void <clinit>():14:14 -> <clinit>
     2:2:void <clinit>():13:13 -> <clinit>
     1:1:void <init>(java.lang.String,int):13:13 -> <init>
     1:1:com.android.tools.r8.shaking.MemberValuePropagationRule$Type[] values():13:13 -> a
-com.android.tools.r8.shaking.ProguardAccessFlags -> com.android.tools.r8.N.v0:
+com.android.tools.r8.shaking.ProguardAccessFlags -> com.android.tools.r8.N.C0:
     java.util.List NAMES -> c
     int PPP_MASK -> b
     int flags -> a
@@ -58061,51 +58529,51 @@
     1:1:void setSynthetic():182:182 -> x
     1:1:void setTransient():150:150 -> y
     1:1:void setVolatile():142:142 -> z
-com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule -> com.android.tools.r8.N.y0:
+com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule -> com.android.tools.r8.N.F0:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     boolean applyToNonProgramClasses() -> p
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder builder():75:75 -> v
-com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1 -> com.android.tools.r8.N.w0:
-com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder -> com.android.tools.r8.N.x0:
+com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1 -> com.android.tools.r8.N.D0:
+com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder -> com.android.tools.r8.N.E0:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule -> com.android.tools.r8.N.B0:
+com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule -> com.android.tools.r8.N.I0:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):46:46 -> <init>
     boolean applyToNonProgramClasses() -> p
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder builder():55:55 -> v
-com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1 -> com.android.tools.r8.N.z0:
-com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder -> com.android.tools.r8.N.A0:
+com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1 -> com.android.tools.r8.N.G0:
+com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder -> com.android.tools.r8.N.H0:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
     1:1:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule build():26:26 -> c
-com.android.tools.r8.shaking.ProguardAssumeValuesRule -> com.android.tools.r8.N.E0:
+com.android.tools.r8.shaking.ProguardAssumeValuesRule -> com.android.tools.r8.N.L0:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardAssumeValuesRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):46:46 -> <init>
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder builder():55:55 -> v
-com.android.tools.r8.shaking.ProguardAssumeValuesRule$1 -> com.android.tools.r8.N.C0:
-com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder -> com.android.tools.r8.N.D0:
+com.android.tools.r8.shaking.ProguardAssumeValuesRule$1 -> com.android.tools.r8.N.J0:
+com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder -> com.android.tools.r8.N.K0:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardAssumeValuesRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardCheckDiscardRule -> com.android.tools.r8.N.H0:
+com.android.tools.r8.shaking.ProguardCheckDiscardRule -> com.android.tools.r8.N.O0:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardCheckDiscardRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):46:46 -> <init>
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder builder():52:52 -> v
-com.android.tools.r8.shaking.ProguardCheckDiscardRule$1 -> com.android.tools.r8.N.F0:
-com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder -> com.android.tools.r8.N.G0:
+com.android.tools.r8.shaking.ProguardCheckDiscardRule$1 -> com.android.tools.r8.N.M0:
+com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder -> com.android.tools.r8.N.N0:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardCheckDiscardRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
     1:1:com.android.tools.r8.shaking.ProguardCheckDiscardRule build():26:26 -> c
-com.android.tools.r8.shaking.ProguardClassFilter -> com.android.tools.r8.N.K0:
+com.android.tools.r8.shaking.ProguardClassFilter -> com.android.tools.r8.N.R0:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList patterns -> a
     1:2:void <clinit>():12:13 -> <clinit>
@@ -58116,15 +58584,15 @@
     4:5:void filterOutMatches(java.util.Set):59:60 -> a
     6:10:void lambda$filterOutMatches$0(java.util.Set,com.android.tools.r8.shaking.ProguardTypeMatcher):61:65 -> a
     1:1:com.android.tools.r8.shaking.ProguardClassFilter$Builder builder():18:18 -> b
-com.android.tools.r8.shaking.ProguardClassFilter$1 -> com.android.tools.r8.N.I0:
-com.android.tools.r8.shaking.ProguardClassFilter$Builder -> com.android.tools.r8.N.J0:
+com.android.tools.r8.shaking.ProguardClassFilter$1 -> com.android.tools.r8.N.P0:
+com.android.tools.r8.shaking.ProguardClassFilter$Builder -> com.android.tools.r8.N.Q0:
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder patterns -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardClassFilter$1):21:21 -> <init>
     2:2:void <init>():24:24 -> <init>
     3:3:void <init>():22:22 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardClassFilter$Builder addPattern(com.android.tools.r8.shaking.ProguardClassNameList):28:28 -> a
     2:2:com.android.tools.r8.shaking.ProguardClassFilter build():33:33 -> a
-com.android.tools.r8.shaking.ProguardClassNameList -> com.android.tools.r8.N.Q0:
+com.android.tools.r8.shaking.ProguardClassNameList -> com.android.tools.r8.N.X0:
     1:1:void <init>():21:21 -> <init>
     java.util.List asSpecificDexTypes() -> a
     void forEachTypeMatcher(java.util.function.Consumer) -> a
@@ -58135,15 +58603,15 @@
     2:2:java.lang.Iterable getWildcardsOrEmpty(com.android.tools.r8.shaking.ProguardClassNameList):91:91 -> a
     java.lang.Iterable getWildcards() -> b
     1:3:java.lang.String toString():71:73 -> toString
-com.android.tools.r8.shaking.ProguardClassNameList$1 -> com.android.tools.r8.N.L0:
-com.android.tools.r8.shaking.ProguardClassNameList$Builder -> com.android.tools.r8.N.M0:
+com.android.tools.r8.shaking.ProguardClassNameList$1 -> com.android.tools.r8.N.S0:
+com.android.tools.r8.shaking.ProguardClassNameList$Builder -> com.android.tools.r8.N.T0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap matchers -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardClassNameList$1):37:37 -> <init>
     2:2:void <init>():44:44 -> <init>
     3:3:void <init>():42:42 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardClassNameList$Builder addClassName(boolean,com.android.tools.r8.shaking.ProguardTypeMatcher):48:48 -> a
     2:9:com.android.tools.r8.shaking.ProguardClassNameList build():53:60 -> a
-com.android.tools.r8.shaking.ProguardClassNameList$MixedClassNameList -> com.android.tools.r8.N.N0:
+com.android.tools.r8.shaking.ProguardClassNameList$MixedClassNameList -> com.android.tools.r8.N.U0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap classNames -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.shaking.ProguardClassNameList$1):279:279 -> <init>
     2:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):283:284 -> <init>
@@ -58160,7 +58628,7 @@
     1:3:java.lang.Iterable getWildcards():342:344 -> b
     1:5:boolean equals(java.lang.Object):312:316 -> equals
     1:1:int hashCode():321:321 -> hashCode
-com.android.tools.r8.shaking.ProguardClassNameList$PositiveClassNameList -> com.android.tools.r8.N.O0:
+com.android.tools.r8.shaking.ProguardClassNameList$PositiveClassNameList -> com.android.tools.r8.N.V0:
     com.android.tools.r8.com.google.common.collect.ImmutableList classNames -> a
     1:1:void <init>(java.util.Collection,com.android.tools.r8.shaking.ProguardClassNameList$1):201:201 -> <init>
     2:3:void <init>(java.util.Collection):205:206 -> <init>
@@ -58177,7 +58645,7 @@
     2:4:java.lang.Iterable getWildcards():259:261 -> b
     1:5:boolean equals(java.lang.Object):231:235 -> equals
     1:1:int hashCode():240:240 -> hashCode
-com.android.tools.r8.shaking.ProguardClassNameList$SingleClassNameList -> com.android.tools.r8.N.P0:
+com.android.tools.r8.shaking.ProguardClassNameList$SingleClassNameList -> com.android.tools.r8.N.W0:
     com.android.tools.r8.shaking.ProguardTypeMatcher className -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardClassNameList$1):139:139 -> <init>
     2:3:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher):143:144 -> <init>
@@ -58190,7 +58658,7 @@
     1:1:java.lang.Iterable getWildcards():187:187 -> b
     1:5:boolean equals(java.lang.Object):162:166 -> equals
     1:1:int hashCode():171:171 -> hashCode
-com.android.tools.r8.shaking.ProguardClassSpecification -> com.android.tools.r8.N.S0:
+com.android.tools.r8.shaking.ProguardClassSpecification -> com.android.tools.r8.N.Z0:
     com.android.tools.r8.shaking.ProguardTypeMatcher inheritanceClassName -> k
     boolean $assertionsDisabled -> n
     com.android.tools.r8.shaking.ProguardClassType classType -> h
@@ -58228,7 +58696,7 @@
     1:1:java.lang.String getSource():228:228 -> n
     1:1:boolean hasInheritanceClassName():244:244 -> o
     1:1:java.lang.String toString():374:374 -> toString
-com.android.tools.r8.shaking.ProguardClassSpecification$Builder -> com.android.tools.r8.N.R0:
+com.android.tools.r8.shaking.ProguardClassSpecification$Builder -> com.android.tools.r8.N.Y0:
     com.android.tools.r8.shaking.ProguardClassType classType -> i
     com.android.tools.r8.shaking.ProguardTypeMatcher inheritanceAnnotation -> k
     boolean inheritanceIsExtends -> m
@@ -58249,7 +58717,7 @@
     1:7:com.android.tools.r8.position.Position getPosition():70:76 -> a
     8:8:com.android.tools.r8.position.Position getPosition():74:74 -> a
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardClassType -> com.android.tools.r8.N.Y0:
+com.android.tools.r8.shaking.ProguardClassType -> com.android.tools.r8.N.f1:
     com.android.tools.r8.shaking.ProguardClassType ANNOTATION_INTERFACE -> a
     com.android.tools.r8.shaking.ProguardClassType CLASS -> b
     com.android.tools.r8.shaking.ProguardClassType UNSPECIFIED -> e
@@ -58262,22 +58730,22 @@
     2:2:void <init>(java.lang.String,int,com.android.tools.r8.shaking.ProguardClassType$1):9:9 -> <init>
     boolean matches(com.android.tools.r8.graph.DexClass) -> a
     1:9:java.lang.String toString():43:51 -> toString
-com.android.tools.r8.shaking.ProguardClassType$1 -> com.android.tools.r8.N.T0:
+com.android.tools.r8.shaking.ProguardClassType$1 -> com.android.tools.r8.N.a1:
     1:1:void <init>(java.lang.String,int):10:10 -> <init>
     1:1:boolean matches(com.android.tools.r8.graph.DexClass):13:13 -> a
-com.android.tools.r8.shaking.ProguardClassType$2 -> com.android.tools.r8.N.U0:
+com.android.tools.r8.shaking.ProguardClassType$2 -> com.android.tools.r8.N.b1:
     1:1:void <init>(java.lang.String,int):16:16 -> <init>
     boolean matches(com.android.tools.r8.graph.DexClass) -> a
-com.android.tools.r8.shaking.ProguardClassType$3 -> com.android.tools.r8.N.V0:
+com.android.tools.r8.shaking.ProguardClassType$3 -> com.android.tools.r8.N.c1:
     1:1:void <init>(java.lang.String,int):22:22 -> <init>
     1:1:boolean matches(com.android.tools.r8.graph.DexClass):25:25 -> a
-com.android.tools.r8.shaking.ProguardClassType$4 -> com.android.tools.r8.N.W0:
+com.android.tools.r8.shaking.ProguardClassType$4 -> com.android.tools.r8.N.d1:
     1:1:void <init>(java.lang.String,int):28:28 -> <init>
     1:1:boolean matches(com.android.tools.r8.graph.DexClass):31:31 -> a
-com.android.tools.r8.shaking.ProguardClassType$5 -> com.android.tools.r8.N.X0:
+com.android.tools.r8.shaking.ProguardClassType$5 -> com.android.tools.r8.N.e1:
     1:1:void <init>(java.lang.String,int):34:34 -> <init>
     boolean matches(com.android.tools.r8.graph.DexClass) -> a
-com.android.tools.r8.shaking.ProguardConfiguration -> com.android.tools.r8.N.a1:
+com.android.tools.r8.shaking.ProguardConfiguration -> com.android.tools.r8.N.h1:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.lang.String packagePrefix -> f
     boolean optimizing -> i
@@ -58358,8 +58826,8 @@
     1:1:boolean hasApplyMappingFile():543:543 -> x
     1:1:boolean hasDontUseMixedCaseClassnames():659:659 -> y
     1:1:boolean isAccessModificationAllowed():531:531 -> z
-com.android.tools.r8.shaking.ProguardConfiguration$1 -> com.android.tools.r8.N.Z0:
-com.android.tools.r8.shaking.ProguardConfiguration$Builder -> com.android.tools.r8.N.a1$a:
+com.android.tools.r8.shaking.ProguardConfiguration$1 -> com.android.tools.r8.N.g1:
+com.android.tools.r8.shaking.ProguardConfiguration$Builder -> com.android.tools.r8.N.h1$a:
     java.lang.String packagePrefix -> f
     java.nio.file.Path classObfuscationDictionary -> D
     boolean overloadAggressively -> N
@@ -58483,7 +58951,7 @@
     1:10:void synthesizeKeepRulesForRecompilation():296:305 -> n
     11:11:void synthesizeKeepRulesForRecompilation():302:302 -> n
     12:12:void synthesizeKeepRulesForRecompilation():301:301 -> n
-com.android.tools.r8.shaking.ProguardConfigurationParser -> com.android.tools.r8.N.f1:
+com.android.tools.r8.shaking.ProguardConfigurationParser -> com.android.tools.r8.N.m1:
     com.android.tools.r8.shaking.ProguardConfiguration$Builder configurationBuilder -> a
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.utils.Reporter reporter -> c
@@ -58528,24 +58996,24 @@
     1:1:java.util.List access$700():46:46 -> i
     1:1:java.util.List access$800():46:46 -> j
     1:1:java.util.List access$900():46:46 -> k
-com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards -> com.android.tools.r8.N.b1:
+com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards -> com.android.tools.r8.N.i1:
     java.util.List wildcards -> b
     java.lang.String pattern -> a
     1:3:void <init>(java.lang.String,java.util.List):2024:2026 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards withoutWildcards(java.lang.String):2030:2030 -> a
     2:3:boolean hasBackreference():2038:2039 -> a
     1:15:boolean hasUnusualCharacters():2043:2057 -> b
-com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation -> com.android.tools.r8.N.c1:
+com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation -> com.android.tools.r8.N.j1:
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards patternWithWildcards -> a
     boolean negated -> b
     1:3:void <init>(java.lang.String,java.util.List,boolean):2068:2070 -> <init>
-com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType -> com.android.tools.r8.N.d1:
+com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType -> com.android.tools.r8.N.k1:
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType CLASS_NAME -> b
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType PACKAGE_NAME -> a
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType ANY -> c
     1:3:void <clinit>():191:193 -> <clinit>
     1:1:void <init>(java.lang.String,int):190:190 -> <init>
-com.android.tools.r8.shaking.ProguardConfigurationParser$ProguardConfigurationSourceParser -> com.android.tools.r8.N.e1:
+com.android.tools.r8.shaking.ProguardConfigurationParser$ProguardConfigurationSourceParser -> com.android.tools.r8.N.l1:
     java.util.function.Predicate PACKAGE_NAME_PREDICATE -> j
     java.nio.file.Path baseDirectory -> g
     boolean $assertionsDisabled -> l
@@ -58876,7 +59344,7 @@
     477:477:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
     477:477:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
     477:477:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
-    478:478:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    478:478:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     478:478:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1209 -> a
     478:478:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
     478:478:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
@@ -58986,15 +59454,13 @@
     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):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
+    16:19:boolean hasNextChar(char):1472:1475 -> d
+    20:20:char acceptQuoteIfPresent():1499:1499 -> d
+    21:24:boolean hasNextChar(java.util.function.Predicate):1479:1482 -> d
+    21:24:char acceptQuoteIfPresent():1499 -> d
+    25:25:char readChar():1524:1524 -> d
+    25:25:char acceptQuoteIfPresent():1499 -> d
+    26:29:boolean lambda$new$6(java.lang.Integer):1583:1586 -> d
     boolean isQuote(char) -> e
     1:7:boolean skipOptionWithOptionalSingleArg(java.lang.String):569:575 -> e
     8:9:boolean lambda$parseFileFilter$2(java.lang.Integer):1388:1389 -> e
@@ -59563,7 +60029,7 @@
     1:6:void skipWhitespace():1432:1437 -> x
     7:14:void skipComment():1443:1450 -> x
     7:14:void skipWhitespace():1439 -> x
-com.android.tools.r8.shaking.ProguardConfigurationRule -> com.android.tools.r8.N.g1:
+com.android.tools.r8.shaking.ProguardConfigurationRule -> com.android.tools.r8.N.n1:
     boolean used -> o
     boolean $assertionsDisabled -> p
     1:1:void <clinit>():21:21 -> <clinit>
@@ -59585,9 +60051,9 @@
     1:1:void markAsUsed():49:49 -> s
     java.lang.String modifierString() -> t
     java.lang.String typeString() -> u
-com.android.tools.r8.shaking.ProguardConfigurationSource -> com.android.tools.r8.N.h1:
+com.android.tools.r8.shaking.ProguardConfigurationSource -> com.android.tools.r8.N.o1:
     java.nio.file.Path getBaseDirectory() -> a
-com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.tools.r8.N.i1:
+com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.tools.r8.N.p1:
     byte[] bytes -> a
     com.android.tools.r8.origin.Origin origin -> b
     1:3:void <init>(byte[],com.android.tools.r8.origin.Origin):18:20 -> <init>
@@ -59595,14 +60061,14 @@
     1:1:java.lang.String get():29:29 -> get
     1:1:java.lang.String getName():40:40 -> getName
     1:1:com.android.tools.r8.origin.Origin getOrigin():45:45 -> getOrigin
-com.android.tools.r8.shaking.ProguardConfigurationSourceFile -> com.android.tools.r8.N.j1:
+com.android.tools.r8.shaking.ProguardConfigurationSourceFile -> com.android.tools.r8.N.q1:
     java.nio.file.Path path -> a
     1:2:void <init>(java.nio.file.Path):18:19 -> <init>
     1:5:java.nio.file.Path getBaseDirectory():29:33 -> a
     1:1:java.lang.String get():24:24 -> get
     1:1:java.lang.String getName():40:40 -> getName
     1:1:com.android.tools.r8.origin.Origin getOrigin():45:45 -> getOrigin
-com.android.tools.r8.shaking.ProguardConfigurationSourceStrings -> com.android.tools.r8.N.k1:
+com.android.tools.r8.shaking.ProguardConfigurationSourceStrings -> com.android.tools.r8.N.r1:
     java.util.List config -> b
     com.android.tools.r8.origin.Origin origin -> c
     java.nio.file.Path basePath -> a
@@ -59610,7 +60076,7 @@
     1:1:java.nio.file.Path getBaseDirectory():47:47 -> a
     1:1:java.lang.String get():42:42 -> get
     1:1:com.android.tools.r8.origin.Origin getOrigin():57:57 -> getOrigin
-com.android.tools.r8.shaking.ProguardConfigurationUtils -> com.android.tools.r8.N.o1:
+com.android.tools.r8.shaking.ProguardConfigurationUtils -> com.android.tools.r8.N.v1:
     com.android.tools.r8.origin.Origin synthesizedRecompilationOrigin -> a
     1:12:void <clinit>():19:30 -> <clinit>
     1:14:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):90:103 -> a
@@ -59619,7 +60085,7 @@
     16:16:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):104:104 -> a
     17:17:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):130:130 -> a
     17:17:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):105 -> a
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     18:18:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):108 -> a
     19:19:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.create(com.android.tools.r8.graph.DexType):101:101 -> a
     19:19:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):108 -> a
@@ -59636,7 +60102,7 @@
     36:36:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):109 -> a
     37:37:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):120:120 -> a
     38:50:boolean hasExplicitAssumeValuesOrAssumeNoSideEffectsRuleForMinSdk(com.android.tools.r8.graph.DexItemFactory,java.util.List):129:141 -> a
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     51:51:boolean hasExplicitAssumeValuesOrAssumeNoSideEffectsRuleForMinSdk(com.android.tools.r8.graph.DexItemFactory,java.util.List):141 -> a
     52:78:boolean hasExplicitAssumeValuesOrAssumeNoSideEffectsRuleForMinSdk(com.android.tools.r8.graph.DexItemFactory,java.util.List):141:167 -> a
     79:82:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):178:181 -> a
@@ -59650,25 +60116,25 @@
     92:92:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):188 -> a
     93:93:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):189:189 -> a
     94:94:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):180:180 -> a
-com.android.tools.r8.shaking.ProguardConfigurationUtils$1 -> com.android.tools.r8.N.l1:
+com.android.tools.r8.shaking.ProguardConfigurationUtils$1 -> com.android.tools.r8.N.s1:
     1:1:void <init>(com.android.tools.r8.origin.Origin):22:22 -> <init>
-com.android.tools.r8.shaking.ProguardConfigurationUtils$2 -> com.android.tools.r8.N.m1:
+com.android.tools.r8.shaking.ProguardConfigurationUtils$2 -> com.android.tools.r8.N.t1:
     1:1:void <init>(com.android.tools.r8.origin.Origin):30:30 -> <init>
-com.android.tools.r8.shaking.ProguardConfigurationUtils$3 -> com.android.tools.r8.N.n1:
+com.android.tools.r8.shaking.ProguardConfigurationUtils$3 -> com.android.tools.r8.N.u1:
     com.android.tools.r8.utils.AndroidApiLevel val$apiLevel -> e
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.AndroidApiLevel):91:91 -> <init>
     1:1:java.lang.String part():94:94 -> part
-com.android.tools.r8.shaking.ProguardIdentifierNameStringRule -> com.android.tools.r8.N.r1:
+com.android.tools.r8.shaking.ProguardIdentifierNameStringRule -> com.android.tools.r8.N.y1:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):45:45 -> <init>
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder builder():51:51 -> v
-com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1 -> com.android.tools.r8.N.p1:
-com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder -> com.android.tools.r8.N.q1:
+com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1 -> com.android.tools.r8.N.w1:
+com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder -> com.android.tools.r8.N.x1:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1):12:12 -> <init>
     2:2:void <init>():15:15 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardIfRule -> com.android.tools.r8.N.u1:
+com.android.tools.r8.shaking.ProguardIfRule -> com.android.tools.r8.N.B1:
     com.android.tools.r8.shaking.ProguardKeepRule subsequentRule -> t
     java.util.Set preconditions -> s
     com.android.tools.r8.origin.Origin neverInlineOrigin -> u
@@ -59692,16 +60158,16 @@
     java.lang.String typeString() -> u
     1:1:java.util.Set getPreconditions():30:30 -> x
     1:1:com.android.tools.r8.shaking.ProguardIfRule$Builder builder():97:97 -> y
-com.android.tools.r8.shaking.ProguardIfRule$1 -> com.android.tools.r8.N.s1:
+com.android.tools.r8.shaking.ProguardIfRule$1 -> com.android.tools.r8.N.z1:
     1:1:void <init>(com.android.tools.r8.origin.Origin):19:19 -> <init>
-com.android.tools.r8.shaking.ProguardIfRule$Builder -> com.android.tools.r8.N.t1:
+com.android.tools.r8.shaking.ProguardIfRule$Builder -> com.android.tools.r8.N.A1:
     com.android.tools.r8.shaking.ProguardKeepRule subsequentRule -> q
     boolean $assertionsDisabled -> r
     1:1:void <clinit>():33:33 -> <clinit>
     1:1:void <init>():38:38 -> <init>
     2:2:void <init>():35:35 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardKeepAttributes -> com.android.tools.r8.N.v1:
+com.android.tools.r8.shaking.ProguardKeepAttributes -> com.android.tools.r8.N.C1:
     boolean runtimeInvisibleAnnotations -> m
     boolean runtimeVisibleParameterAnnotations -> n
     boolean runtimeInvisibleParameterAnnotations -> o
@@ -59734,7 +60200,7 @@
     1:5:boolean equals(java.lang.Object):176:180 -> equals
     1:16:int hashCode():200:215 -> hashCode
     1:1:java.lang.String toString():298:298 -> toString
-com.android.tools.r8.shaking.ProguardKeepRule -> com.android.tools.r8.N.y1:
+com.android.tools.r8.shaking.ProguardKeepRule -> com.android.tools.r8.N.F1:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardKeepRuleType,com.android.tools.r8.shaking.ProguardKeepRuleModifiers):50:50 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardKeepRule$Builder builder():59:59 -> a
     1:1:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):116 -> a
@@ -59769,13 +60235,13 @@
     44:51:void appendNonEmpty(java.lang.StringBuilder,java.lang.String,java.lang.Object,java.lang.String):102:109 -> a
     1:5:boolean equals(java.lang.Object):91:95 -> equals
     1:1:com.android.tools.r8.shaking.ProguardKeepRule$Builder builder():59:59 -> x
-com.android.tools.r8.shaking.ProguardKeepRule$1 -> com.android.tools.r8.N.w1:
+com.android.tools.r8.shaking.ProguardKeepRule$1 -> com.android.tools.r8.N.D1:
     1:1:void <init>(com.android.tools.r8.origin.Origin):118:118 -> <init>
-com.android.tools.r8.shaking.ProguardKeepRule$Builder -> com.android.tools.r8.N.x1:
+com.android.tools.r8.shaking.ProguardKeepRule$Builder -> com.android.tools.r8.N.E1:
     1:1:void <init>():18:18 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
     1:3:com.android.tools.r8.shaking.ProguardKeepRule build():28:30 -> c
-com.android.tools.r8.shaking.ProguardKeepRuleBase -> com.android.tools.r8.N.A1:
+com.android.tools.r8.shaking.ProguardKeepRuleBase -> com.android.tools.r8.N.H1:
     com.android.tools.r8.shaking.ProguardKeepRuleModifiers modifiers -> r
     com.android.tools.r8.shaking.ProguardKeepRuleType type -> q
     1:5:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardKeepRuleType,com.android.tools.r8.shaking.ProguardKeepRuleModifiers):58:62 -> <init>
@@ -59785,13 +60251,13 @@
     1:1:java.lang.String typeString():116:116 -> u
     1:1:com.android.tools.r8.shaking.ProguardKeepRuleModifiers getModifiers():70:70 -> v
     1:1:com.android.tools.r8.shaking.ProguardKeepRuleType getType():66:66 -> w
-com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder -> com.android.tools.r8.N.z1:
+com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder -> com.android.tools.r8.N.G1:
     com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder modifiersBuilder -> p
     com.android.tools.r8.shaking.ProguardKeepRuleType type -> o
     1:1:void <init>():21:21 -> <init>
     2:2:void <init>():18:18 -> <init>
     1:2:com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder setType(com.android.tools.r8.shaking.ProguardKeepRuleType):25:26 -> a
-com.android.tools.r8.shaking.ProguardKeepRuleModifiers -> com.android.tools.r8.N.D1:
+com.android.tools.r8.shaking.ProguardKeepRuleModifiers -> com.android.tools.r8.N.K1:
     boolean allowsShrinking -> a
     boolean allowsOptimization -> b
     boolean allowsObfuscation -> c
@@ -59803,8 +60269,8 @@
     1:6:boolean equals(java.lang.Object):63:68 -> equals
     1:4:int hashCode():76:79 -> hashCode
     1:6:java.lang.String toString():84:89 -> toString
-com.android.tools.r8.shaking.ProguardKeepRuleModifiers$1 -> com.android.tools.r8.N.B1:
-com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder -> com.android.tools.r8.N.C1:
+com.android.tools.r8.shaking.ProguardKeepRuleModifiers$1 -> com.android.tools.r8.N.I1:
+com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder -> com.android.tools.r8.N.J1:
     boolean allowsShrinking -> a
     boolean allowsOptimization -> b
     boolean allowsObfuscation -> c
@@ -59817,7 +60283,7 @@
     1:1:void setAllowsOptimization(boolean):21:21 -> b
     1:1:void setAllowsShrinking(boolean):17:17 -> c
     1:1:void setIncludeDescriptorClasses(boolean):30:30 -> d
-com.android.tools.r8.shaking.ProguardKeepRuleType -> com.android.tools.r8.N.E1:
+com.android.tools.r8.shaking.ProguardKeepRuleType -> com.android.tools.r8.N.L1:
     com.android.tools.r8.shaking.ProguardKeepRuleType[] $VALUES -> e
     com.android.tools.r8.shaking.ProguardKeepRuleType KEEP_CLASS_MEMBERS -> b
     com.android.tools.r8.shaking.ProguardKeepRuleType KEEP_CLASSES_WITH_MEMBERS -> c
@@ -59828,7 +60294,7 @@
     1:1:void <init>(java.lang.String,int):8:8 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardKeepRuleType[] values():8:8 -> a
     1:11:java.lang.String toString():16:26 -> toString
-com.android.tools.r8.shaking.ProguardMemberRule -> com.android.tools.r8.N.H1:
+com.android.tools.r8.shaking.ProguardMemberRule -> com.android.tools.r8.N.O1:
     com.android.tools.r8.shaking.ProguardNameMatcher name -> f
     com.android.tools.r8.shaking.ProguardMemberType ruleType -> d
     com.android.tools.r8.shaking.ProguardTypeMatcher type -> e
@@ -59945,10 +60411,10 @@
     52:52:java.lang.String toString():390 -> toString
     53:53:java.lang.String toString():390:390 -> toString
     54:88:java.lang.String toString():369:403 -> toString
-com.android.tools.r8.shaking.ProguardMemberRule$1 -> com.android.tools.r8.N.F1:
+com.android.tools.r8.shaking.ProguardMemberRule$1 -> com.android.tools.r8.N.M1:
     int[] $SwitchMap$com$android$tools$r8$shaking$ProguardMemberType -> a
     1:1:void <clinit>():174:174 -> <clinit>
-com.android.tools.r8.shaking.ProguardMemberRule$Builder -> com.android.tools.r8.N.G1:
+com.android.tools.r8.shaking.ProguardMemberRule$Builder -> com.android.tools.r8.N.N1:
     com.android.tools.r8.shaking.ProguardNameMatcher name -> f
     boolean $assertionsDisabled -> i
     com.android.tools.r8.shaking.ProguardMemberType ruleType -> d
@@ -59974,7 +60440,7 @@
     1:1:com.android.tools.r8.shaking.ProguardAccessFlags getNegatedAccessFlags():51:51 -> c
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher getTypeMatcher():64:64 -> d
     1:1:boolean isValid():87:87 -> e
-com.android.tools.r8.shaking.ProguardMemberRuleReturnValue -> com.android.tools.r8.N.J1:
+com.android.tools.r8.shaking.ProguardMemberRuleReturnValue -> com.android.tools.r8.N.Q1:
     com.android.tools.r8.utils.LongInterval longInterval -> c
     boolean $assertionsDisabled -> e
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type type -> a
@@ -59994,14 +60460,14 @@
     1:1:boolean isSingleValue():78:78 -> g
     1:1:boolean isValueRange():56:56 -> h
     1:17:java.lang.String toString():111:127 -> toString
-com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type -> com.android.tools.r8.N.I1:
+com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type -> com.android.tools.r8.N.P1:
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type BOOLEAN -> a
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type FIELD -> c
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type VALUE_RANGE -> b
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type NULL -> d
     1:4:void <clinit>():12:15 -> <clinit>
     1:1:void <init>(java.lang.String,int):11:11 -> <init>
-com.android.tools.r8.shaking.ProguardMemberType -> com.android.tools.r8.N.K1:
+com.android.tools.r8.shaking.ProguardMemberType -> com.android.tools.r8.N.R1:
     com.android.tools.r8.shaking.ProguardMemberType METHOD -> h
     com.android.tools.r8.shaking.ProguardMemberType CONSTRUCTOR -> g
     com.android.tools.r8.shaking.ProguardMemberType INIT -> f
@@ -60015,7 +60481,7 @@
     9:9:void <clinit>():6:6 -> <clinit>
     1:1:void <init>(java.lang.String,int):6:6 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardMemberType[] values():6:6 -> a
-com.android.tools.r8.shaking.ProguardNameMatcher -> com.android.tools.r8.N.P1:
+com.android.tools.r8.shaking.ProguardNameMatcher -> com.android.tools.r8.N.W1:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.shaking.ProguardNameMatcher MATCH_ALL_NAMES -> a
     1:3:void <clinit>():14:16 -> <clinit>
@@ -60032,8 +60498,8 @@
     1:43:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):39:81 -> b
     44:66:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):56:78 -> b
     67:111:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):43:87 -> b
-com.android.tools.r8.shaking.ProguardNameMatcher$1 -> com.android.tools.r8.N.L1:
-com.android.tools.r8.shaking.ProguardNameMatcher$MatchAllNames -> com.android.tools.r8.N.M1:
+com.android.tools.r8.shaking.ProguardNameMatcher$1 -> com.android.tools.r8.N.S1:
+com.android.tools.r8.shaking.ProguardNameMatcher$MatchAllNames -> com.android.tools.r8.N.T1:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> c
     1:1:void <init>():108:108 -> <init>
     2:3:void <init>(com.android.tools.r8.shaking.ProguardWildcard):111:112 -> <init>
@@ -60041,7 +60507,7 @@
     2:2:java.lang.Iterable getWildcards():123:123 -> a
     1:1:com.android.tools.r8.shaking.ProguardNameMatcher$MatchAllNames materialize():128:128 -> b
     1:1:com.android.tools.r8.shaking.ProguardNameMatcher materialize():104 -> b
-com.android.tools.r8.shaking.ProguardNameMatcher$MatchNamePattern -> com.android.tools.r8.N.N1:
+com.android.tools.r8.shaking.ProguardNameMatcher$MatchNamePattern -> com.android.tools.r8.N.U1:
     java.util.List wildcards -> d
     java.lang.String pattern -> c
     1:3:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards):142:144 -> <init>
@@ -60052,14 +60518,14 @@
     1:1:boolean equals(java.lang.Object):180:180 -> equals
     1:1:int hashCode():185:185 -> hashCode
     1:1:java.lang.String toString():172:172 -> toString
-com.android.tools.r8.shaking.ProguardNameMatcher$MatchSpecificName -> com.android.tools.r8.N.O1:
+com.android.tools.r8.shaking.ProguardNameMatcher$MatchSpecificName -> com.android.tools.r8.N.V1:
     java.lang.String name -> c
     1:2:void <init>(java.lang.String):193:194 -> <init>
     1:1:boolean matches(java.lang.String):199:199 -> a
     1:1:boolean equals(java.lang.Object):209:209 -> equals
     1:1:int hashCode():214:214 -> hashCode
     1:1:java.lang.String toString():204:204 -> toString
-com.android.tools.r8.shaking.ProguardPackageMatcher -> com.android.tools.r8.N.Q1:
+com.android.tools.r8.shaking.ProguardPackageMatcher -> com.android.tools.r8.N.X1:
     java.lang.String pattern -> a
     1:2:void <init>(java.lang.String):12:13 -> <init>
     1:1:boolean matches(com.android.tools.r8.graph.DexType):17:17 -> a
@@ -60071,7 +60537,7 @@
     57:86:boolean matchPackageNameImpl(java.lang.String,int,java.lang.String,int):44:73 -> a
     1:5:boolean equals(java.lang.Object):85:89 -> equals
     1:1:int hashCode():94:94 -> hashCode
-com.android.tools.r8.shaking.ProguardPackageNameList -> com.android.tools.r8.N.T1:
+com.android.tools.r8.shaking.ProguardPackageNameList -> com.android.tools.r8.N.a2:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap packageNames -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.shaking.ProguardPackageNameList$1):12:12 -> <init>
     2:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):39:40 -> <init>
@@ -60079,15 +60545,15 @@
     2:5:boolean matches(com.android.tools.r8.graph.DexType):60:63 -> a
     1:15:boolean equals(java.lang.Object):74:88 -> equals
     1:6:int hashCode():98:103 -> hashCode
-com.android.tools.r8.shaking.ProguardPackageNameList$1 -> com.android.tools.r8.N.R1:
-com.android.tools.r8.shaking.ProguardPackageNameList$Builder -> com.android.tools.r8.N.S1:
+com.android.tools.r8.shaking.ProguardPackageNameList$1 -> com.android.tools.r8.N.Y1:
+com.android.tools.r8.shaking.ProguardPackageNameList$Builder -> com.android.tools.r8.N.Z1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap matchers -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPackageNameList$1):18:18 -> <init>
     2:2:void <init>():24:24 -> <init>
     3:3:void <init>():21:21 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardPackageNameList$Builder addPackageName(boolean,com.android.tools.r8.shaking.ProguardPackageMatcher):28:28 -> a
     2:2:com.android.tools.r8.shaking.ProguardPackageNameList build():33:33 -> a
-com.android.tools.r8.shaking.ProguardPathFilter -> com.android.tools.r8.N.W1:
+com.android.tools.r8.shaking.ProguardPathFilter -> com.android.tools.r8.N.d2:
     boolean enabled -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList patterns -> b
     boolean $assertionsDisabled -> c
@@ -60097,8 +60563,8 @@
     1:1:boolean isEnabled():55:55 -> a
     2:4:boolean matches(java.lang.String):59:61 -> a
     1:1:com.android.tools.r8.shaking.ProguardPathFilter$Builder builder():14:14 -> b
-com.android.tools.r8.shaking.ProguardPathFilter$1 -> com.android.tools.r8.N.U1:
-com.android.tools.r8.shaking.ProguardPathFilter$Builder -> com.android.tools.r8.N.V1:
+com.android.tools.r8.shaking.ProguardPathFilter$1 -> com.android.tools.r8.N.b2:
+com.android.tools.r8.shaking.ProguardPathFilter$Builder -> com.android.tools.r8.N.c2:
     boolean enabled -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder patterns -> b
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPathFilter$1):17:17 -> <init>
@@ -60108,13 +60574,13 @@
     2:2:com.android.tools.r8.shaking.ProguardPathFilter build():40:40 -> a
     1:1:com.android.tools.r8.shaking.ProguardPathFilter$Builder disable():30:30 -> b
     1:1:com.android.tools.r8.shaking.ProguardPathFilter$Builder enable():35:35 -> c
-com.android.tools.r8.shaking.ProguardPathList -> com.android.tools.r8.N.c2:
+com.android.tools.r8.shaking.ProguardPathList -> com.android.tools.r8.N.j2:
     1:1:void <init>():10:10 -> <init>
     boolean matches(java.lang.String) -> a
     1:1:com.android.tools.r8.shaking.ProguardPathList$Builder builder():13:13 -> a
     1:1:com.android.tools.r8.shaking.ProguardPathList emptyList():17:17 -> b
-com.android.tools.r8.shaking.ProguardPathList$1 -> com.android.tools.r8.N.X1:
-com.android.tools.r8.shaking.ProguardPathList$Builder -> com.android.tools.r8.N.Y1:
+com.android.tools.r8.shaking.ProguardPathList$1 -> com.android.tools.r8.N.e2:
+com.android.tools.r8.shaking.ProguardPathList$Builder -> com.android.tools.r8.N.f2:
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder matchers -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPathList$1):22:22 -> <init>
     2:2:void <init>():26:26 -> <init>
@@ -60123,11 +60589,11 @@
     1:1:com.android.tools.r8.shaking.ProguardPathList$Builder addFileName(java.lang.String):30 -> a
     2:2:com.android.tools.r8.shaking.ProguardPathList$Builder addFileName(java.lang.String,boolean):34:34 -> a
     3:7:com.android.tools.r8.shaking.ProguardPathList build():39:43 -> a
-com.android.tools.r8.shaking.ProguardPathList$EmptyPathList -> com.android.tools.r8.N.Z1:
+com.android.tools.r8.shaking.ProguardPathList$EmptyPathList -> com.android.tools.r8.N.g2:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPathList$1):122:122 -> <init>
     2:2:void <init>():124:124 -> <init>
     boolean matches(java.lang.String) -> a
-com.android.tools.r8.shaking.ProguardPathList$FileNameMatcher -> com.android.tools.r8.N.a2:
+com.android.tools.r8.shaking.ProguardPathList$FileNameMatcher -> com.android.tools.r8.N.h2:
     boolean negated -> a
     java.lang.String pattern -> b
     1:3:void <init>(boolean,java.lang.String):52:54 -> <init>
@@ -60139,12 +60605,12 @@
     34:34:boolean containsSeparatorsStartingAt(java.lang.String,int):98:98 -> a
     34:34:boolean matchImpl(java.lang.String,int,java.lang.String,int):70 -> a
     35:56:boolean matchImpl(java.lang.String,int,java.lang.String,int):73:94 -> a
-com.android.tools.r8.shaking.ProguardPathList$PathList -> com.android.tools.r8.N.b2:
+com.android.tools.r8.shaking.ProguardPathList$PathList -> com.android.tools.r8.N.i2:
     java.util.List matchers -> a
     1:1:void <init>(java.util.List,com.android.tools.r8.shaking.ProguardPathList$1):103:103 -> <init>
     2:3:void <init>(java.util.List):106:107 -> <init>
     1:4:boolean matches(java.lang.String):112:115 -> a
-com.android.tools.r8.shaking.ProguardRuleParserException -> com.android.tools.r8.N.d2:
+com.android.tools.r8.shaking.ProguardRuleParserException -> com.android.tools.r8.N.k2:
     com.android.tools.r8.origin.Origin origin -> c
     com.android.tools.r8.position.Position position -> d
     java.lang.String message -> a
@@ -60154,7 +60620,7 @@
     1:1:java.lang.String getMessage():48:48 -> getMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():33:33 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():38:38 -> getPosition
-com.android.tools.r8.shaking.ProguardTypeMatcher -> com.android.tools.r8.N.m2:
+com.android.tools.r8.shaking.ProguardTypeMatcher -> com.android.tools.r8.N.t2:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher$1):23:23 -> <init>
     2:2:void <init>():31:31 -> <init>
     com.android.tools.r8.graph.DexType getSpecificType() -> a
@@ -60168,19 +60634,19 @@
     27:27:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):86:86 -> a
     28:28:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):84:84 -> a
     29:29:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):82:82 -> a
-    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     30:30:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):93 -> a
     31:34:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):93:96 -> a
     1:1:java.lang.Iterable getWildcards():55:55 -> b
     boolean hasSpecificType() -> c
     boolean isTripleDotPattern() -> d
-com.android.tools.r8.shaking.ProguardTypeMatcher$1 -> com.android.tools.r8.N.e2:
-com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType -> com.android.tools.r8.N.f2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$1 -> com.android.tools.r8.N.l2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType -> com.android.tools.r8.N.m2:
     com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType CLASS -> a
     com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType TYPE -> b
     1:2:void <clinit>():35:36 -> <clinit>
     1:1:void <init>(java.lang.String,int):34:34 -> <init>
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAllTypes -> com.android.tools.r8.N.g2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAllTypes -> com.android.tools.r8.N.n2:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> a
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_ALL_TYPES -> b
     1:1:void <clinit>():128:128 -> <clinit>
@@ -60195,7 +60661,7 @@
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$000():126:126 -> e
     1:1:boolean equals(java.lang.Object):163:163 -> equals
     1:1:int hashCode():168:168 -> hashCode
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAnyArgSequence -> com.android.tools.r8.N.h2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAnyArgSequence -> com.android.tools.r8.N.o2:
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_ANY_ARG_SEQUENCE -> a
     1:1:void <clinit>():174:174 -> <clinit>
     1:1:void <init>():172:172 -> <init>
@@ -60204,7 +60670,7 @@
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$100():172:172 -> e
     1:1:boolean equals(java.lang.Object):193:193 -> equals
     1:1:int hashCode():198:198 -> hashCode
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchBasicTypes -> com.android.tools.r8.N.i2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchBasicTypes -> com.android.tools.r8.N.p2:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> a
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_BASIC_TYPES -> b
     1:1:void <clinit>():259:259 -> <clinit>
@@ -60219,7 +60685,7 @@
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$400():257:257 -> e
     1:1:boolean equals(java.lang.Object):297:297 -> equals
     1:1:int hashCode():302:302 -> hashCode
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchClassTypes -> com.android.tools.r8.N.j2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchClassTypes -> com.android.tools.r8.N.q2:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> b
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_CLASS_TYPES -> c
     boolean $assertionsDisabled -> e
@@ -60242,7 +60708,7 @@
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$300():202:202 -> f
     1:1:int hashCode():253:253 -> hashCode
     1:1:java.lang.String toString():243:243 -> toString
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchSpecificType -> com.android.tools.r8.N.k2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchSpecificType -> com.android.tools.r8.N.r2:
     com.android.tools.r8.graph.DexType type -> a
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardTypeMatcher$1):306:306 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexType):310:311 -> <init>
@@ -60252,7 +60718,7 @@
     1:2:boolean equals(java.lang.Object):326:327 -> equals
     1:1:int hashCode():334:334 -> hashCode
     1:1:java.lang.String toString():321:321 -> toString
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchTypePattern -> com.android.tools.r8.N.l2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchTypePattern -> com.android.tools.r8.N.s2:
     java.util.List wildcards -> b
     java.lang.String pattern -> a
     com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType kind -> c
@@ -60266,7 +60732,7 @@
     22:68:java.lang.String removeMaterializedBackReferencesFromPattern(java.lang.String,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):413:459 -> a
     22:68:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):394 -> a
     69:70:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):395:396 -> a
-    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     71:71:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):397 -> a
     72:82:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):398:408 -> a
     83:174:boolean matchClassOrTypeNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType):470:561 -> a
@@ -60281,17 +60747,17 @@
     1:3:boolean equals(java.lang.Object):589:591 -> equals
     1:1:int hashCode():598:598 -> hashCode
     1:1:java.lang.String toString():584:584 -> toString
-com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule -> com.android.tools.r8.N.p2:
+com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule -> com.android.tools.r8.N.w2:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):46:46 -> <init>
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder builder():52:52 -> v
-com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1 -> com.android.tools.r8.N.n2:
-com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder -> com.android.tools.r8.N.o2:
+com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1 -> com.android.tools.r8.N.u2:
+com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder -> com.android.tools.r8.N.v2:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardWildcard -> com.android.tools.r8.N.s2:
+com.android.tools.r8.shaking.ProguardWildcard -> com.android.tools.r8.N.z2:
     1:1:void <init>():8:8 -> <init>
     com.android.tools.r8.shaking.ProguardWildcard$BackReference asBackReference() -> a
     void setCaptured(java.lang.String) -> a
@@ -60300,7 +60766,7 @@
     boolean isBackReference() -> d
     boolean isPattern() -> e
     com.android.tools.r8.shaking.ProguardWildcard materialize() -> f
-com.android.tools.r8.shaking.ProguardWildcard$BackReference -> com.android.tools.r8.N.q2:
+com.android.tools.r8.shaking.ProguardWildcard$BackReference -> com.android.tools.r8.N.x2:
     int referenceIndex -> b
     com.android.tools.r8.shaking.ProguardWildcard$Pattern reference -> a
     1:2:void <init>(int):85:86 -> <init>
@@ -60315,7 +60781,7 @@
     6:6:com.android.tools.r8.shaking.ProguardWildcard materialize():80 -> f
     1:1:java.lang.String getCaptured():105:105 -> g
     1:1:java.lang.String toString():130:130 -> toString
-com.android.tools.r8.shaking.ProguardWildcard$Pattern -> com.android.tools.r8.N.r2:
+com.android.tools.r8.shaking.ProguardWildcard$Pattern -> com.android.tools.r8.N.y2:
     java.lang.String pattern -> a
     java.lang.String captured -> b
     1:1:void <init>(java.lang.String):35:35 -> <init>
@@ -60324,12 +60790,13 @@
     com.android.tools.r8.shaking.ProguardWildcard$Pattern asPattern() -> b
     1:1:void clearCaptured():46:46 -> c
     boolean isPattern() -> e
-    1:5:com.android.tools.r8.shaking.ProguardWildcard$Pattern materialize():56:60 -> f
-    6:10:com.android.tools.r8.shaking.ProguardWildcard$Pattern materialize():56:60 -> f
-    6:10:com.android.tools.r8.shaking.ProguardWildcard materialize():31 -> f
+    1:1:com.android.tools.r8.shaking.ProguardWildcard materialize():31:31 -> f
+    2:6:com.android.tools.r8.shaking.ProguardWildcard$Pattern materialize():56:60 -> f
+    7:7:void setCaptured(java.lang.String):41:41 -> f
+    7:7:com.android.tools.r8.shaking.ProguardWildcard$Pattern materialize():60 -> f
     1:1:java.lang.String getCaptured():51:51 -> g
     1:1:java.lang.String toString():76:76 -> toString
-com.android.tools.r8.shaking.RootSetBuilder -> com.android.tools.r8.N.v2:
+com.android.tools.r8.shaking.RootSetBuilder -> com.android.tools.r8.N.C2:
     java.util.Set identifierNameStrings -> w
     java.util.Map dependentKeepClassCompatRule -> s
     com.android.tools.r8.graph.AppView appView -> a
@@ -60489,7 +60956,7 @@
     com.android.tools.r8.graph.DexReference lambda$addItemToSets$19(com.android.tools.r8.graph.DexReference) -> e
     1:1:java.util.Map lambda$includeDescriptor$12(com.android.tools.r8.graph.DexReference):816:816 -> f
     1:1:java.util.Set lambda$includeDescriptor$13(com.android.tools.r8.graph.DexReference):817:817 -> g
-com.android.tools.r8.shaking.RootSetBuilder$1 -> com.android.tools.r8.N.t2:
+com.android.tools.r8.shaking.RootSetBuilder$1 -> com.android.tools.r8.N.A2:
     int[] $SwitchMap$com$android$tools$r8$shaking$InlineRule$Type -> b
     int[] $SwitchMap$com$android$tools$r8$shaking$ClassInlineRule$Type -> c
     int[] $SwitchMap$com$android$tools$r8$shaking$ClassMergingRule$Type -> d
@@ -60500,7 +60967,7 @@
     3:3:void <clinit>():964:964 -> <clinit>
     4:4:void <clinit>():942:942 -> <clinit>
     5:5:void <clinit>():139:139 -> <clinit>
-com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet -> com.android.tools.r8.N.u2:
+com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet -> com.android.tools.r8.N.B2:
     java.util.Map noShrinking -> c
     java.util.Set noOptimization -> d
     java.util.Set noObfuscation -> e
@@ -60510,7 +60977,7 @@
     java.util.Map dependentKeepClassCompatRule -> g
     1:1:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.shaking.RootSetBuilder$1):1410:1410 -> <init>
     2:9:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map,java.util.Map):1426:1433 -> <init>
-com.android.tools.r8.shaking.RootSetBuilder$RootSet -> com.android.tools.r8.N.v2$a:
+com.android.tools.r8.shaking.RootSetBuilder$RootSet -> com.android.tools.r8.N.C2$a:
     java.util.Map assumedValues -> q
     java.util.Map dependentNoShrinking -> r
     java.util.Map dependentKeepClassCompatRule -> s
@@ -60597,7 +61064,7 @@
     2:6:boolean verifyKeptTypesAreLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1279:1283 -> c
     7:7:java.util.Set lambda$verifyKeptItemsAreKept$6(com.android.tools.r8.graph.DexType):1323:1323 -> c
     1:21:java.lang.String toString():1385:1405 -> toString
-com.android.tools.r8.shaking.ScopedDexMethodSet -> com.android.tools.r8.N.x2:
+com.android.tools.r8.shaking.ScopedDexMethodSet -> com.android.tools.r8.N.E2:
     java.util.Map items -> b
     com.android.tools.r8.com.google.common.base.Equivalence METHOD_EQUIVALENCE -> c
     com.android.tools.r8.shaking.ScopedDexMethodSet parent -> a
@@ -60615,13 +61082,13 @@
     1:1:com.android.tools.r8.shaking.ScopedDexMethodSet newNestedScope():36:36 -> b
     2:11:com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult addMethodIfMoreVisible(com.android.tools.r8.graph.DexEncodedMethod):58:67 -> b
     12:19:com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult addMethodIfMoreVisible(com.android.tools.r8.graph.DexEncodedMethod):64:71 -> b
-com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult -> com.android.tools.r8.N.w2:
+com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult -> com.android.tools.r8.N.D2:
     com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult ADDED_NOT_EXISTING -> b
     com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult ADDED_MORE_VISIBLE -> c
     com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult NOT_ADDED -> a
     1:3:void <clinit>():17:19 -> <clinit>
     1:1:void <init>(java.lang.String,int):16:16 -> <init>
-com.android.tools.r8.shaking.StaticClassMerger -> com.android.tools.r8.N.B2:
+com.android.tools.r8.shaking.StaticClassMerger -> com.android.tools.r8.N.I2:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> i
     com.android.tools.r8.com.google.common.base.Equivalence fieldEquivalence -> c
@@ -60699,7 +61166,7 @@
     42:42:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):296 -> c
     43:53:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):303:313 -> c
     54:59:boolean lambda$satisfiesMergeCriteria$1(com.android.tools.r8.graph.DexEncodedMethod):288:293 -> c
-com.android.tools.r8.shaking.StaticClassMerger$MergeGroup -> com.android.tools.r8.N.z2:
+com.android.tools.r8.shaking.StaticClassMerger$MergeGroup -> com.android.tools.r8.N.G2:
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup DONT_MERGE -> d
     boolean $assertionsDisabled -> i
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key mainDexDependenciesGlobalKey -> f
@@ -60717,7 +61184,7 @@
     11:11:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key globalKey():117:117 -> a
     12:13:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key key(java.lang.String):126:127 -> a
     1:9:java.lang.String toString():132:140 -> toString
-com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key -> com.android.tools.r8.N.y2:
+com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key -> com.android.tools.r8.N.F2:
     java.lang.String packageOrGlobal -> b
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup mergeGroup -> a
     1:3:void <init>(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup,java.lang.String):77:79 -> <init>
@@ -60726,7 +61193,7 @@
     1:1:boolean isGlobal():91:91 -> c
     1:5:boolean equals(java.lang.Object):104:108 -> equals
     1:1:int hashCode():96:96 -> hashCode
-com.android.tools.r8.shaking.StaticClassMerger$Representative -> com.android.tools.r8.N.A2:
+com.android.tools.r8.shaking.StaticClassMerger$Representative -> com.android.tools.r8.N.H2:
     com.android.tools.r8.shaking.StaticClassMerger this$0 -> d
     com.android.tools.r8.graph.DexProgramClass clazz -> a
     com.android.tools.r8.com.google.common.collect.HashMultiset methodBuckets -> c
@@ -60743,7 +61210,7 @@
     9:9:void include(com.android.tools.r8.graph.DexProgramClass):167 -> a
     10:10:com.android.tools.r8.graph.DexProgramClass access$200(com.android.tools.r8.shaking.StaticClassMerger$Representative):151:151 -> a
     11:15:boolean isFull():183:187 -> a
-com.android.tools.r8.shaking.TreePruner -> com.android.tools.r8.N.C2:
+com.android.tools.r8.shaking.TreePruner -> com.android.tools.r8.N.J2:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set prunedTypes -> d
@@ -60786,17 +61253,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():1060:1060 -> a
+    137:137:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> a
     137:137:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):255 -> a
     138:145:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):255:262 -> a
     146:151:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):259:264 -> a
-    152:152:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1060:1060 -> a
+    152:152:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> a
     152:152:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):264 -> a
     153:175:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):264:286 -> a
-    176:176:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():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:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    176:176:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):666 -> a
     176:176:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):286 -> a
-    177:178:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):672:673 -> a
+    177:178:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):667:668 -> a
     177:178:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):286 -> a
     179:190:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):285:296 -> a
     191:191:boolean lambda$reachableMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedMethod):244:244 -> a
@@ -60805,17 +61272,17 @@
     223:223:java.util.Collection getMethodsToKeepForConfigurationDebugging():337:337 -> a
     1:1:java.util.Collection getRemovedClasses():333:333 -> b
     1:6:com.android.tools.r8.graph.DexApplication run():54:59 -> c
-com.android.tools.r8.shaking.UnusedArgumentRule -> com.android.tools.r8.N.F2:
+com.android.tools.r8.shaking.UnusedArgumentRule -> com.android.tools.r8.N.M2:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.UnusedArgumentRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.UnusedArgumentRule$Builder builder():74:74 -> v
-com.android.tools.r8.shaking.UnusedArgumentRule$1 -> com.android.tools.r8.N.D2:
-com.android.tools.r8.shaking.UnusedArgumentRule$Builder -> com.android.tools.r8.N.E2:
+com.android.tools.r8.shaking.UnusedArgumentRule$1 -> com.android.tools.r8.N.K2:
+com.android.tools.r8.shaking.UnusedArgumentRule$Builder -> com.android.tools.r8.N.L2:
     1:1:void <init>(com.android.tools.r8.shaking.UnusedArgumentRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.UsagePrinter -> com.android.tools.r8.N.H2:
+com.android.tools.r8.shaking.UsagePrinter -> com.android.tools.r8.N.O2:
     com.android.tools.r8.graph.DexProgramClass enclosingClazz -> b
     java.util.function.Consumer consumer -> a
     boolean $assertionsDisabled -> e
@@ -60896,14 +61363,14 @@
     10:10:void append(java.lang.String):26:26 -> b
     10:10:void printClazzPrefixIfNecessary():51 -> b
     11:11:void printClazzPrefixIfNecessary():52:52 -> b
-com.android.tools.r8.shaking.UsagePrinter$NoOpUsagePrinter -> com.android.tools.r8.N.G2:
+com.android.tools.r8.shaking.UsagePrinter$NoOpUsagePrinter -> com.android.tools.r8.N.N2:
     1:1:void <init>():96:96 -> <init>
     void printUnusedClass(com.android.tools.r8.graph.DexProgramClass) -> a
     void printUnusedField(com.android.tools.r8.graph.DexEncodedField) -> a
     void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void visited() -> a
     void visiting(com.android.tools.r8.graph.DexProgramClass) -> b
-com.android.tools.r8.shaking.VerticalClassMerger -> com.android.tools.r8.N.S2:
+com.android.tools.r8.shaking.VerticalClassMerger -> com.android.tools.r8.N.Z2:
     com.android.tools.r8.shaking.AppInfoWithLiveness appInfo -> b
     boolean $assertionsDisabled -> p
     com.android.tools.r8.graph.AppView appView -> c
@@ -60935,7 +61402,7 @@
     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):603:603 -> a
+    67:67:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.isSerializable(com.android.tools.r8.graph.DexType):602:602 -> a
     67:67:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):400 -> a
     68:68:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):400:400 -> a
     69:69:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
@@ -61025,14 +61492,14 @@
     1:1:com.android.tools.r8.shaking.AppInfoWithLiveness access$200(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> k
     1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> l
     1:1:java.util.concurrent.ExecutorService access$900(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> m
-com.android.tools.r8.shaking.VerticalClassMerger$1 -> com.android.tools.r8.N.I2:
+com.android.tools.r8.shaking.VerticalClassMerger$1 -> com.android.tools.r8.N.P2:
     int[] $SwitchMap$com$android$tools$r8$shaking$VerticalClassMerger$Rename -> b
     int[] $SwitchMap$com$android$tools$r8$ir$code$Invoke$Type -> c
     int[] $SwitchMap$com$android$tools$r8$shaking$VerticalClassMerger$AbortReason -> a
     1:1:void <clinit>():1950:1950 -> <clinit>
     2:2:void <clinit>():1379:1379 -> <clinit>
     3:3:void <clinit>():152:152 -> <clinit>
-com.android.tools.r8.shaking.VerticalClassMerger$AbortReason -> com.android.tools.r8.N.J2:
+com.android.tools.r8.shaking.VerticalClassMerger$AbortReason -> com.android.tools.r8.N.Q2:
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason PINNED_SOURCE -> h
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason NO_SIDE_EFFECTS -> g
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason NATIVE_METHOD -> f
@@ -61061,7 +61528,7 @@
     56:56:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):147:147 -> a
     57:57:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):202:202 -> a
     57:57:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):147 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.N.K2:
+com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.N.R2:
     com.android.tools.r8.graph.DexClass source -> a
     com.android.tools.r8.graph.DexClass target -> b
     com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder deferredRenamings -> c
@@ -61093,7 +61560,7 @@
     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():1060:1060 -> a
+    35:35:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> a
     35:35:com.android.tools.r8.graph.PresortedComparable com.android.tools.r8.graph.DexEncodedMethod.getKey():80 -> a
     35:35:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1287 -> a
     36:36:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1287:1287 -> a
@@ -61150,10 +61617,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():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 com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> c
+    112:112:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):666 -> c
     112:112:boolean merge():977 -> c
-    113:114:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):672:673 -> c
+    113:114:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):667:668 -> c
     113:114:boolean merge():977 -> c
     115:115:boolean merge():979:979 -> c
     116:116:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
@@ -61188,7 +61655,7 @@
     343:343:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> c
     343:343:boolean merge():915 -> c
     344:344:boolean lambda$restoreDebuggingState$6(com.android.tools.r8.graph.DexEncodedMethod):1124:1124 -> c
-com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.N.L2:
+com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.N.S2:
     java.util.Map seenPositions -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap sourceProtoCache -> c
     java.util.Collection invokes -> f
@@ -61205,7 +61672,7 @@
     23:24:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1598:1599 -> a
     25:56:int computePositionsFor(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1618:1649 -> a
     1:18:void fillSeenPositions():1591:1608 -> b
-com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.N.M2:
+com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.N.T2:
     com.android.tools.r8.graph.AppView appView -> e
     boolean $assertionsDisabled -> g
     com.android.tools.r8.graph.DexMethod context -> d
@@ -61230,7 +61697,7 @@
     11:17:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1812:1818 -> e
     18:21:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):1827:1830 -> e
     1:12:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1793:1804 -> f
-com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> com.android.tools.r8.N.N2:
+com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> com.android.tools.r8.N.U2:
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> b
     java.util.Set mergeeCandidates -> c
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> d
@@ -61247,7 +61714,7 @@
     33:33:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):588:588 -> a
     34:48:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):612:626 -> a
     49:56:boolean typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):632:639 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$Rename -> com.android.tools.r8.N.O2:
+com.android.tools.r8.shaking.VerticalClassMerger$Rename -> com.android.tools.r8.N.V2:
     com.android.tools.r8.shaking.VerticalClassMerger$Rename[] $VALUES -> d
     com.android.tools.r8.shaking.VerticalClassMerger$Rename IF_NEEDED -> b
     com.android.tools.r8.shaking.VerticalClassMerger$Rename ALWAYS -> a
@@ -61256,7 +61723,7 @@
     4:4:void <clinit>():208:208 -> <clinit>
     1:1:void <init>(java.lang.String,int):208:208 -> <init>
     1:1:com.android.tools.r8.shaking.VerticalClassMerger$Rename[] values():208:208 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLense -> com.android.tools.r8.N.P2:
+com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLense -> com.android.tools.r8.N.W2:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> d
     com.android.tools.r8.graph.DexType target -> c
@@ -61273,7 +61740,7 @@
     3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):1708:1708 -> b
     1:1:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):1742:1742 -> c
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):1737:1737 -> f
-com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.N.Q2:
+com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.N.X2:
     com.android.tools.r8.ir.code.Invoke$Type type -> f
     com.android.tools.r8.graph.DexMethod invocationTarget -> e
     boolean isInterface -> g
@@ -61286,7 +61753,7 @@
     15:15:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):1952:1952 -> a
     1:1:java.util.function.Consumer getRegistryCallback():1949:1949 -> p
     1:10:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():1935:1944 -> q
-com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer -> com.android.tools.r8.N.R2:
+com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer -> com.android.tools.r8.N.Y2:
     com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder lensBuilder -> a
     java.util.Map protoFixupCache -> b
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> c
@@ -61334,7 +61801,7 @@
     57:57:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1504:1504 -> a
     58:58:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1503:1503 -> a
     59:69:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):1519:1529 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses -> com.android.tools.r8.N.S2$a:
+com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses -> com.android.tools.r8.N.Z2$a:
     java.util.Map mergedClasses -> a
     java.util.Map sources -> b
     boolean $assertionsDisabled -> c
@@ -61347,7 +61814,7 @@
     1:2:com.android.tools.r8.graph.DexType getTargetFor(com.android.tools.r8.graph.DexType):109:110 -> b
     1:1:boolean hasBeenMergedIntoSubtype(com.android.tools.r8.graph.DexType):114:114 -> c
     1:1:java.util.List lambda$new$0(com.android.tools.r8.graph.DexType):99:99 -> d
-com.android.tools.r8.shaking.VerticalClassMergerGraphLense -> com.android.tools.r8.N.V2:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLense -> com.android.tools.r8.N.c3:
     boolean $assertionsDisabled -> o
     java.util.Map originalMethodSignaturesForBridges -> n
     java.util.Map contextualVirtualToDirectMethodMaps -> l
@@ -61365,8 +61832,8 @@
     1:1:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):121:121 -> b
     1:7:boolean isContextFreeForMethod(com.android.tools.r8.graph.DexMethod):147:153 -> c
     1:12:java.util.Set lookupMethodInAllContexts(com.android.tools.r8.graph.DexMethod):126:137 -> e
-com.android.tools.r8.shaking.VerticalClassMergerGraphLense$1 -> com.android.tools.r8.N.T2:
-com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder -> com.android.tools.r8.N.U2:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLense$1 -> com.android.tools.r8.N.a3:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder -> com.android.tools.r8.N.b3:
     java.util.Map methodMap -> c
     boolean $assertionsDisabled -> i
     com.android.tools.r8.com.google.common.collect.BiMap fieldMap -> b
@@ -61409,7 +61876,7 @@
     104:117:void merge(com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder):336:349 -> a
     1:1:void markMethodAsMerged(com.android.tools.r8.graph.DexMethod):308:308 -> b
     2:2:void recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):321:321 -> b
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer -> com.android.tools.r8.N.Y2:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer -> com.android.tools.r8.N.f3:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():43:43 -> <clinit>
     1:1:void <init>(com.android.tools.r8.experimental.graphinfo.GraphConsumer):58:58 -> <init>
@@ -61439,7 +61906,7 @@
     32:36:java.lang.String getNodeString(com.android.tools.r8.experimental.graphinfo.GraphNode):230 -> b
     37:43:java.lang.String getNodeString(com.android.tools.r8.experimental.graphinfo.GraphNode):230:236 -> b
     44:44:java.lang.String getNodeString(com.android.tools.r8.experimental.graphinfo.GraphNode):235:235 -> b
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter -> com.android.tools.r8.N.W2:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter -> com.android.tools.r8.N.d3:
     java.io.PrintStream output -> a
     int indentation -> b
     1:1:void <init>(java.io.PrintStream):257:257 -> <init>
@@ -61449,19 +61916,19 @@
     1:2:void indent():268:269 -> b
     3:5:void addReason(java.lang.String):274:276 -> b
     1:3:void startItem(java.lang.String):262:264 -> c
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath -> com.android.tools.r8.N.X2:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath -> com.android.tools.r8.N.e3:
     com.android.tools.r8.experimental.graphinfo.GraphNode node -> a
     com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath path -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():46:46 -> <clinit>
     1:4:void <init>(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath):50:53 -> <init>
-com.android.tools.r8.shaking.WhyAreYouNotInliningRule -> com.android.tools.r8.N.b3:
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule -> com.android.tools.r8.N.i3:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder builder():74:74 -> v
-com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1 -> com.android.tools.r8.N.Z2:
-com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder -> com.android.tools.r8.N.a3:
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1 -> com.android.tools.r8.N.g3:
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder -> com.android.tools.r8.N.h3:
     1:1:void <init>(com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
@@ -61678,27 +62145,31 @@
     1:1:void <init>(java.nio.file.Path):38:38 -> <init>
     2:11:void <init>(java.nio.file.Path):31:40 -> <init>
     1:2:void close(com.android.tools.r8.DiagnosticsHandler):51:52 -> a
-    3:10:void writeDelayed(com.android.tools.r8.DiagnosticsHandler):67:74 -> a
-    3:10:void close(com.android.tools.r8.DiagnosticsHandler):54 -> a
-    11:16:void close(com.android.tools.r8.DiagnosticsHandler):55:60 -> a
-    17:22:void handleIOException(java.io.IOException,com.android.tools.r8.DiagnosticsHandler):100:105 -> a
-    23:23:void addDirectory(java.lang.String,com.android.tools.r8.DiagnosticsHandler):111:111 -> a
-    24:29:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):133:138 -> a
-    30:30:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):137:137 -> a
-    31:40:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):133:142 -> a
-    41:41:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):141:141 -> a
-    42:42:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):139:139 -> a
-    43:43:void addFile(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):148:148 -> a
-    44:47:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):171:174 -> a
-    48:52:void writeNextIfAvailable(com.android.tools.r8.DiagnosticsHandler):160:164 -> a
-    48:52:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):175 -> a
-    53:54:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):178:179 -> a
-    55:55:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):178:178 -> a
-    56:56:java.nio.file.Path getPath():190:190 -> a
+    3:7:void writeDelayed(com.android.tools.r8.DiagnosticsHandler):67:71 -> a
+    3:7:void close(com.android.tools.r8.DiagnosticsHandler):54 -> a
+    8:21:void writeDirectoryNow(java.lang.String,com.android.tools.r8.DiagnosticsHandler):115:128 -> a
+    8:21:void writeDelayed(com.android.tools.r8.DiagnosticsHandler):71 -> a
+    8:21:void close(com.android.tools.r8.DiagnosticsHandler):54 -> a
+    22:23:void writeDelayed(com.android.tools.r8.DiagnosticsHandler):73:74 -> a
+    22:23:void close(com.android.tools.r8.DiagnosticsHandler):54 -> a
+    24:29:void close(com.android.tools.r8.DiagnosticsHandler):55:60 -> a
+    30:35:void handleIOException(java.io.IOException,com.android.tools.r8.DiagnosticsHandler):100:105 -> a
+    36:36:void addDirectory(java.lang.String,com.android.tools.r8.DiagnosticsHandler):111:111 -> a
+    37:42:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):133:138 -> a
+    43:43:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):137:137 -> a
+    44:53:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):133:142 -> a
+    54:54:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):141:141 -> a
+    55:55:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):139:139 -> a
+    56:56:void addFile(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):148:148 -> a
+    57:60:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):171:174 -> a
+    61:65:void writeNextIfAvailable(com.android.tools.r8.DiagnosticsHandler):160:164 -> a
+    61:65:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):175 -> a
+    66:67:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):178:179 -> a
+    68:68:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):178:178 -> a
+    69:69:java.nio.file.Path getPath():190:190 -> a
     1:4:java.util.zip.ZipOutputStream getStreamRaw():80:83 -> b
     5:11:java.util.zip.ZipOutputStream getStream(com.android.tools.r8.DiagnosticsHandler):90:96 -> b
-    12:25:void writeDirectoryNow(java.lang.String,com.android.tools.r8.DiagnosticsHandler):115:128 -> b
-    26:28:void writeFileNow(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):153:155 -> b
+    12:14:void writeFileNow(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):153:155 -> b
     1:1:com.android.tools.r8.origin.Origin getOrigin():185:185 -> getOrigin
     1:2:void open():45:46 -> open
 com.android.tools.r8.utils.ArchiveBuilder$1 -> com.android.tools.r8.utils.i:
@@ -61860,7 +62331,7 @@
     19:19:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):105 -> a
     20:20:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):105:105 -> a
     21:23:java.util.Collection collectTypes():112:114 -> a
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     24:24:java.util.Collection collectTypes():114 -> a
     25:25:java.util.Collection collectTypes():114:114 -> a
     1:1:java.lang.String toString():121:121 -> toString
@@ -62232,113 +62703,114 @@
     25:25:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):96 -> getProgramResource
     26:26:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):96:96 -> getProgramResource
 com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.utils.O:
-    com.android.tools.r8.StringConsumer usageInformationConsumer -> S0
+    com.android.tools.r8.StringConsumer proguardMapConsumer -> S0
+    boolean hasMarker -> f0
     boolean passthroughDexCode -> i
-    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> W0
     int callGraphCycleEliminatorMaxDepthThreshold -> K
-    boolean quiet -> b0
+    boolean verbose -> b0
     com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> f
-    java.lang.String printCfgFile -> A0
-    boolean enableRedundantConstNumberOptimization -> X
+    boolean enableUninstantiatedTypeOptimization -> X
     boolean enableArgumentRemoval -> q
-    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> t0
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> X0
+    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> t0
     boolean enableClassInlining -> y
+    java.util.List mainDexKeepRules -> J0
     boolean enableTreeShakingOfLibraryMethodOverrides -> G
     boolean printMemory -> h
     java.util.Set neverMergePrefixes -> k
-    boolean minimalMainDex -> J0
-    boolean configurationDebugging -> E0
     int callGraphLikelySpuriousCallEdgeThreshold -> L
     boolean encodeChecksums -> I
     boolean enableNeverMergePrefixes -> j
-    boolean enableStringSwitchConversion -> Q
+    boolean printCfg -> A0
     boolean enableUnusedArgumentRemoval -> r
-    boolean printCfg -> z0
-    boolean lookupLibraryBeforeProgram -> v0
+    boolean enableMinification -> z0
+    java.util.Map warningInvalidDebugInfo -> P0
+    boolean processCovariantReturnTypeAnnotations -> v0
+    boolean enableRedundantConstNumberOptimization -> Y
     boolean enableClassStaticizer -> z
-    boolean enableNestReduction -> r0
+    boolean enableNestBasedAccessDesugaring -> r0
     boolean enableCallSiteOptimizationInfoPropagation -> H
-    boolean enableDesugaring -> n0
-    boolean intermediate -> j0
+    boolean enableLambdaMerging -> n0
     boolean enableHorizontalClassMerging -> o
     int classInliningInstructionLimit -> M
-    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> Z0
-    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> T0
-    boolean invalidDebugInfoFatal -> c0
-    boolean enableValuePropagation -> V
+    com.android.tools.r8.StringConsumer usageInformationConsumer -> T0
+    boolean quiet -> c0
+    boolean enableRedundantFieldLoadElimination -> V
     boolean enableInliningOfInvokesWithNullableReceivers -> w
-    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
+    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> X0
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> Y0
+    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> h0
     boolean enableNameReflectionOptimization -> E
     com.android.tools.r8.ProgramConsumer programConsumer -> d
-    boolean enableInheritanceClassInDexDistributor -> K0
+    boolean minimalMainDex -> K0
     int inliningInstructionLimit -> N
-    boolean skipIR -> F0
+    boolean configurationDebugging -> F0
     boolean enableVerticalClassMerging -> p
-    boolean $assertionsDisabled -> c1
-    boolean ignoreMissingClasses -> B0
-    boolean enableUninstantiatedTypeOptimization -> W
+    boolean enableValuePropagation -> W
     boolean disableInliningOfLibraryMethodOverrides -> x
     com.android.tools.r8.graph.DexItemFactory itemFactory -> a
-    boolean enableMainDexListCheck -> w0
-    java.util.List logArgumentsFilter -> l0
-    java.util.Map warningInvalidDebugInfo -> O0
+    boolean lookupLibraryBeforeProgram -> w0
+    boolean enableNestReduction -> s0
+    java.util.Map warningInvalidParameterAnnotations -> O0
     boolean enableStringConcatenationOptimization -> F
     boolean printTimes -> g
-    boolean enableGeneratedExtensionRegistryShrinking -> o0
-    java.util.List methodsFilter -> h0
-    boolean readCompileTimeAnnotations -> k0
+    boolean enableDesugaring -> o0
+    boolean intermediate -> k0
     com.android.tools.r8.DataResourceConsumer dataResourceConsumer -> e
     boolean enableDynamicTypeOptimization -> m
-    boolean ignoreMainDexMissingClasses -> d0
+    boolean invalidDebugInfoFatal -> d0
     int inliningInstructionAllowance -> O
-    com.android.tools.r8.StringConsumer mainDexListConsumer -> Q0
-    com.android.tools.r8.StringConsumer configurationConsumer -> U0
+    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> U0
     boolean enableNonNullTracking -> u
     com.android.tools.r8.utils.Reporter reporter -> c
-    boolean enableInitializedClassesInInstanceMethodsAnalysis -> T
-    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> H0
-    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> g0
-    boolean skipReadingDexCode -> P0
+    com.android.tools.r8.utils.InternalOptions$AssertionProcessing assertionProcessing -> E0
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> Z0
+    java.util.Set extensiveLoggingFilter -> g0
+    boolean enableInheritanceClassInDexDistributor -> L0
+    boolean debug -> H0
     boolean enableDeterminismAnalysis -> C
-    int inliningControlFlowResolutionBlocksThreshold -> P
+    int inliningMonitorEnterValuesAllowance -> P
+    java.util.function.Consumer syntheticProguardRulesConsumer -> b1
     boolean enableFieldBitAccessAnalysis -> n
-    boolean debug -> G0
-    boolean forceProguardCompatibility -> C0
-    boolean enableRedundantFieldLoadElimination -> U
+    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> M0
+    boolean skipIR -> G0
+    boolean $assertionsDisabled -> d1
+    boolean ignoreMissingClasses -> C0
+    boolean enableInitializedClassesInInstanceMethodsAnalysis -> U
     boolean enableInlining -> v
-    boolean enableTreeShaking -> x0
-    boolean enableGeneratedMessageLiteShrinking -> p0
-    java.util.Map warningInvalidParameterAnnotations -> N0
-    int numberOfThreads -> Y
+    int minApiLevel -> j0
+    boolean enableMainDexListCheck -> x0
+    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> a1
+    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> W0
+    com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> T
+    boolean enableGeneratedExtensionRegistryShrinking -> p0
+    java.util.List logArgumentsFilter -> m0
+    java.util.Map missingEnclosingMembers -> N0
+    boolean readCompileTimeAnnotations -> l0
+    java.util.Set reportedMissingForDesugaring -> c1
+    java.util.List methodsFilter -> i0
     boolean enableServiceLoaderRewriting -> D
-    com.android.tools.r8.StringConsumer proguardMapConsumer -> R0
-    boolean hasMarker -> e0
-    boolean verbose -> a0
-    boolean enableEnumValueOptimization -> R
+    int inliningControlFlowResolutionBlocksThreshold -> Q
+    com.android.tools.r8.StringConsumer mainDexListConsumer -> R0
+    boolean ignoreMainDexMissingClasses -> e0
+    boolean useSmaliSyntax -> a0
+    com.android.tools.r8.StringConsumer configurationConsumer -> V0
+    java.lang.String printCfgFile -> B0
+    boolean enableStringSwitchConversion -> R
     boolean enableUnusedInterfaceRemoval -> s
-    boolean useSmaliSyntax -> Z
-    java.util.Set extensiveLoggingFilter -> f0
-    java.util.List mainDexKeepRules -> I0
+    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> I0
+    int numberOfThreads -> Z
+    boolean skipReadingDexCode -> Q0
     java.util.function.BiPredicate dexClassChecksumFilter -> J
     boolean enableInitializedClassesAnalysis -> A
+    boolean forceProguardCompatibility -> D0
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> b
-    java.util.function.Consumer syntheticProguardRulesConsumer -> a1
     boolean libraryInterfacesMayHaveStaticInitialization -> l
-    int minApiLevel -> i0
-    boolean enableMinification -> y0
-    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> V0
+    boolean enableTreeShaking -> y0
+    boolean enableEnumValueOptimization -> S
+    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> u0
     boolean enableDevirtualization -> t
-    boolean processCovariantReturnTypeAnnotations -> u0
-    boolean enableNestBasedAccessDesugaring -> q0
-    java.util.Map missingEnclosingMembers -> M0
-    boolean enableLambdaMerging -> m0
+    boolean enableGeneratedMessageLiteShrinking -> q0
     boolean enableSideEffectAnalysis -> B
-    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>
@@ -62346,192 +62818,192 @@
     25:25:com.android.tools.r8.utils.DexVersion com.android.tools.r8.utils.AndroidApiLevel.getDexVersion():67:67 -> <clinit>
     25:25:void <clinit>():88 -> <clinit>
     1:1:void <init>():112:112 -> <init>
-    2: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():425:425 -> E
-    1:1:boolean isProtoShrinkingEnabled():1078:1078 -> F
-    1:1:boolean isShrinking():421:421 -> G
-    1:1:boolean isStringSwitchConversionEnabled():1074:1074 -> H
-    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():368 -> J
-    1:1:boolean isDesugaredLibraryCompilation():309:309 -> K
-    1:1:boolean shouldKeepStackMapTable():313 -> K
+    2:522:void <init>():106:626 -> <init>
+    523:527:void <init>():113:117 -> <init>
+    528:528:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):121:121 -> <init>
+    529:1049:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):106:626 -> <init>
+    1050:1057:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):122:129 -> <init>
+    1058:1058:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):133:133 -> <init>
+    1059:1579:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):106:626 -> <init>
+    1580:1591:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):134:145 -> <init>
+    1:1:boolean isDesugaredLibraryCompilation():311:311 -> A
+    1:1:boolean isGeneratingClassFiles():332:332 -> B
+    1:1:boolean isGeneratingDexIndexed():324:324 -> C
+    1:1:boolean isGeneratingDex():320 -> C
+    2:2:boolean isGeneratingDexFilePerClassFile():328:328 -> C
+    2:2:boolean isGeneratingDex():320 -> C
+    1:1:boolean hasConsumer():295:295 -> D
+    1:1:boolean isInterfaceMethodDesugaringEnabled():1067 -> D
+    2:4:boolean isInterfaceMethodDesugaringEnabled():1070:1072 -> D
+    1:1:boolean isMinifying():427:427 -> E
+    1:1:boolean isProtoShrinkingEnabled():1080:1080 -> F
+    1:1:boolean isShrinking():423:423 -> G
+    1:1:boolean isStringSwitchConversionEnabled():1076:1076 -> H
+    1:32:boolean printWarnings():801:832 -> I
+    33:72:boolean printWarnings():828:867 -> I
+    1:4:boolean shouldDesugarNests():367:370 -> J
+    5:5:boolean isGeneratingClassFiles():332:332 -> J
+    5:5:boolean canUseNestBasedAccess():1050 -> J
+    5:5:boolean shouldDesugarNests():370 -> J
+    1:1:boolean isDesugaredLibraryCompilation():311:311 -> K
+    1:1:boolean shouldKeepStackMapTable():315 -> K
     2:2:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():99:99 -> K
-    2:2:boolean shouldKeepStackMapTable():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
+    2:2:boolean shouldKeepStackMapTable():316 -> K
+    3:3:boolean shouldKeepStackMapTable():316:316 -> K
+    1:13:void signalFinishedToConsumers():348:360 -> L
+    1:1:boolean assertionsEnabled():621:621 -> M
+    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():488:496 -> N
+    1:9:java.util.Set getExtensiveLoggingFilter():462:470 -> O
+    1:1:boolean shouldEnableKeepRuleSynthesisForRecompilation():458:458 -> P
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:1:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):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
+    1:1:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):270:270 -> a
+    2:8:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):278:284 -> a
+    2:8:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):273 -> a
+    9:9:boolean isGeneratingClassFiles():332:332 -> a
+    9:9:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):285 -> a
+    9:9:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):273 -> a
+    10:13:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):286:289 -> a
+    10:13:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):273 -> a
+    14:14:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):629:629 -> a
+    15:15:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):651:651 -> a
+    16:17:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):745:746 -> a
     18:18:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    18:18:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):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
+    18:18:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):750 -> a
+    19:19:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):750:750 -> a
     20:20:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    20:20:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):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
+    20:20:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):751 -> a
+    21:21:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):751:751 -> a
+    22:22:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):746:746 -> a
+    23:24:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):758:759 -> a
     25:25:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    25:25:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):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
+    25:25:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):761 -> a
+    26:26:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):761:761 -> a
     27:27:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    27:27:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):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
+    27:27:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):763 -> a
+    28:28:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):763:763 -> a
     29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    29:29:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):762 -> a
+    29:29:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):764 -> a
     30:30:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    30:30:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):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
+    30:30:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):764 -> a
+    31:31:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):764:764 -> a
     32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    32:32:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):765 -> a
+    32:32:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):767 -> a
     33:33:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    33:33:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):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
+    33:33:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):767 -> a
+    34:34:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):767:767 -> a
+    35:35:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):759:759 -> a
+    36:39:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):772:775 -> a
+    40:44:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):780:784 -> a
+    45:51:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):789:795 -> a
+    52:52:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):790:790 -> a
     53:53:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26:26 -> a
-    53:53:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):788 -> a
+    53:53:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):790 -> a
     54:54:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
     54:54:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26 -> a
-    54:54:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):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):638:641 -> b
+    54:54:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):790 -> a
+    55:55:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):790:790 -> a
+    56:56:java.util.List lambda$warningInvalidDebugInfo$3(com.android.tools.r8.origin.Origin):794:794 -> a
+    57:62:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):881:886 -> a
+    63:64:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1021:1022 -> a
+    65:66:boolean canHaveArtInstanceOfVerifierBug():1356:1357 -> a
+    1:4:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):640:643 -> b
     5:5:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> b
-    5:5:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):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
+    5:5:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):645 -> b
+    6:8:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):645:647 -> b
+    9:9:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):643:643 -> b
+    10:10:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):629:629 -> b
+    10:10:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):641 -> b
+    11:15:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):667:671 -> b
+    16:16:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):651:651 -> b
+    16:16:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):672 -> b
+    17:18:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):676:677 -> b
     19:19:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> b
-    19:19:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):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():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):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):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):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():330:330 -> g
-    1:1:boolean canUseConstantMethodHandle():1032 -> g
-    2:2:boolean canUseConstantMethodHandle():1032:1032 -> g
-    1:1:boolean isGeneratingClassFiles():330:330 -> h
-    1:1:boolean canUseConstantMethodType():1036 -> h
-    2:2:boolean canUseConstantMethodType():1036:1036 -> h
-    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():330:330 -> k
-    1:1:boolean canUseInvokeCustom():1040 -> k
-    2:2:boolean canUseInvokeCustom():1040:1040 -> k
-    1:1:boolean isGeneratingClassFiles():330:330 -> l
-    1:1:boolean canUseInvokePolymorphic():1028 -> l
-    2:2:boolean canUseInvokePolymorphic():1028:1028 -> l
-    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():330:330 -> o
-    1:1:boolean canUseNotInstruction():1149 -> o
-    2:2:boolean canUseNotInstruction():1149:1149 -> o
-    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():330:330 -> r
-    1:1:boolean canUseSuppressedExceptions():1087 -> r
-    2:2:boolean canUseSuppressedExceptions():1087:1087 -> r
-    1:1:boolean isGeneratingClassFiles():330:330 -> s
-    1:1:boolean canUseTwrCloseResourceMethod():1056 -> s
-    2:2:boolean canUseTwrCloseResourceMethod():1056:1056 -> s
+    19:19:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):679 -> b
+    20:20:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):679:679 -> b
+    21:21:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):739:739 -> b
+    21:21:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):681 -> b
+    22:22:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):681:681 -> b
+    23:23:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):677:677 -> b
+    24:24:java.util.List lambda$warningInvalidParameterAnnotations$2(com.android.tools.r8.origin.Origin):783:783 -> b
+    25:25:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1433:1433 -> b
+    1:1:boolean isGeneratingClassFiles():332:332 -> c
+    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1447 -> c
+    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1447:1447 -> c
+    3:6:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):633:636 -> c
+    7:7:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):629:629 -> c
+    7:7:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):634 -> c
+    8:10:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):655:657 -> c
+    11:11:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):651:651 -> c
+    11:11:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):658 -> c
+    12:12:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):662:662 -> c
+    13:13:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):739:739 -> c
+    13:13:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):662 -> c
+    14:14:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):662:662 -> c
+    15:15:java.util.List lambda$warningMissingEnclosingMember$1(com.android.tools.r8.origin.Origin):774:774 -> c
+    1:1:boolean isGeneratingClassFiles():332:332 -> d
+    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1103 -> d
+    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1103:1103 -> d
+    3:5:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):685:687 -> d
+    6:40:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):701:735 -> d
+    1:1:boolean isGeneratingClassFiles():332:332 -> e
+    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1054 -> e
+    2:2:boolean canLeaveStaticInterfaceMethodInvokes():1054:1054 -> e
+    3:5:java.lang.String messageWarningMissingNestHost(com.android.tools.r8.graph.DexClass):694:696 -> e
+    1:1:boolean isGeneratingClassFiles():332:332 -> f
+    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1093 -> f
+    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1093:1093 -> f
+    1:1:boolean isGeneratingClassFiles():332:332 -> g
+    1:1:boolean canUseConstantMethodHandle():1034 -> g
+    2:2:boolean canUseConstantMethodHandle():1034:1034 -> g
+    1:1:boolean isGeneratingClassFiles():332:332 -> h
+    1:1:boolean canUseConstantMethodType():1038 -> h
+    2:2:boolean canUseConstantMethodType():1038:1038 -> h
+    1:1:boolean isGeneratingClassFiles():332:332 -> i
+    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1046 -> i
+    2:2:boolean canUseDefaultAndStaticInterfaceMethods():1046:1046 -> i
+    1:2:boolean canUseFilledNewArrayOfObjects():1115:1116 -> j
+    1:1:boolean isGeneratingClassFiles():332:332 -> k
+    1:1:boolean canUseInvokeCustom():1042 -> k
+    2:2:boolean canUseInvokeCustom():1042:1042 -> k
+    1:1:boolean isGeneratingClassFiles():332:332 -> l
+    1:1:boolean canUseInvokePolymorphic():1030 -> l
+    2:2:boolean canUseInvokePolymorphic():1030:1030 -> l
+    1:1:boolean isGeneratingClassFiles():332:332 -> m
+    1:1:boolean canUseInvokePolymorphicOnVarHandle():1026 -> m
+    2:2:boolean canUseInvokePolymorphicOnVarHandle():1026:1026 -> m
+    1:2:boolean canUseMultidex():1084:1085 -> n
+    1:1:boolean isGeneratingClassFiles():332:332 -> o
+    1:1:boolean canUseNotInstruction():1151 -> o
+    2:2:boolean canUseNotInstruction():1151:1151 -> o
+    1:1:boolean isGeneratingClassFiles():332:332 -> p
+    1:1:boolean canUsePrivateInterfaceMethods():1062 -> p
+    2:2:boolean canUsePrivateInterfaceMethods():1062:1062 -> p
+    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1124:1125 -> q
+    1:1:boolean isGeneratingClassFiles():332:332 -> r
+    1:1:boolean canUseSuppressedExceptions():1089 -> r
+    2:2:boolean canUseSuppressedExceptions():1089:1089 -> r
+    1:1:boolean isGeneratingClassFiles():332:332 -> s
+    1:1:boolean canUseTwrCloseResourceMethod():1058 -> s
+    2:2:boolean canUseTwrCloseResourceMethod():1058:1058 -> s
     1:4:void disableAllOptimizations():149:152 -> t
     1:17:void disableGlobalOptimizations():156:172 -> u
-    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():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.utils.InternalOutputMode getInternalOutputMode():299:299 -> v
+    2:2:boolean hasConsumer():295:295 -> v
+    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():299 -> v
+    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():299:299 -> v
+    4:4:boolean isGeneratingDexIndexed():324:324 -> v
+    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():300 -> v
+    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():301:301 -> v
+    6:6:boolean isGeneratingDexFilePerClassFile():328:328 -> v
+    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():302 -> v
+    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():303:303 -> v
+    8:8:boolean isGeneratingClassFiles():332:332 -> v
+    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():304 -> v
+    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():305:307 -> v
     1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():99:99 -> w
-    1:1:boolean hasMethodsFilter():874:874 -> x
+    1:1:boolean hasMethodsFilter():876:876 -> x
     1:1:boolean hasProguardConfiguration():95:95 -> y
-    1:1:boolean hasUsageInformationConsumer():581:581 -> z
+    1:1:boolean hasUsageInformationConsumer():583:583 -> z
 com.android.tools.r8.utils.InternalOptions$AssertionProcessing -> com.android.tools.r8.utils.O$a:
     com.android.tools.r8.utils.InternalOptions$AssertionProcessing LEAVE -> a
     com.android.tools.r8.utils.InternalOptions$AssertionProcessing REMOVE -> b
@@ -62542,7 +63014,7 @@
     int expectedParameterCount -> b
     int actualParameterCount -> c
     com.android.tools.r8.graph.DexMethod method -> a
-    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):538:541 -> <init>
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):540:543 -> <init>
 com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.utils.O$b:
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization ON -> b
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization OFF -> a
@@ -62553,16 +63025,16 @@
     boolean enabled -> a
     int minSize -> b
     int maxSize -> c
-    1:9:void <init>():906:914 -> <init>
+    1:9:void <init>():908:916 -> <init>
 com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.utils.Q:
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] $VALUES -> d
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode FLATTEN -> c
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode REPACKAGE -> b
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode NONE -> a
-    1:5:void <clinit>():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
+    1:5:void <clinit>():901:905 -> <clinit>
+    6:6:void <clinit>():899:899 -> <clinit>
+    1:1:void <init>(java.lang.String,int):899:899 -> <init>
+    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] values():899:899 -> a
 com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.utils.O$d:
     boolean invertConditionals -> m
     boolean dontCreateMarkerInD8 -> o
@@ -62599,20 +63071,20 @@
     boolean addCallEdgesForLibraryInvokes -> c
     java.io.PrintStream whyAreYouNotInliningConsumer -> B
     boolean verifyKeptGraphInfo -> D
-    1:85:void <init>():917:1001 -> <init>
+    1:85:void <init>():919:1003 -> <init>
 com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.utils.S:
     java.util.Comparator interfaceMethodOrdering -> a
-    1:3:void <init>():987:989 -> <init>
-    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):993:994 -> a
-    3:3:int lambda$getInterfaceMethodOrderingOrDefault$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):994:994 -> a
+    1:3:void <init>():989:991 -> <init>
+    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):995:996 -> a
+    3:3:int lambda$getInterfaceMethodOrderingOrDefault$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):996:996 -> a
 com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.utils.T:
     int numberOfProguardIfRuleMemberEvaluations -> b
     int numberOfProguardIfRuleClassEvaluations -> a
-    1:4:void <init>():1004:1007 -> <init>
+    1:4:void <init>():1006:1009 -> <init>
 com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.utils.U:
     com.android.tools.r8.graph.DexType type -> b
     int version -> a
-    1:3:void <init>(int,com.android.tools.r8.graph.DexType):550:552 -> <init>
+    1:3:void <init>(int,com.android.tools.r8.graph.DexType):552:554 -> <init>
 com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.utils.V:
     com.android.tools.r8.utils.InternalOutputMode DexIndexed -> a
     com.android.tools.r8.utils.InternalOutputMode DexFilePerClassFile -> b
@@ -62621,14 +63093,24 @@
     1:1:void <init>(java.lang.String,int):7:7 -> <init>
     1:1:boolean isGeneratingClassFiles():13:13 -> a
     1:1:boolean isGeneratingDex():17:17 -> b
-com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.utils.W:
+com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.utils.X:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():15:15 -> <clinit>
-    1:4:java.lang.Object peekNext(java.util.ListIterator):24:27 -> a
-    5:8:void removeIf(java.util.Iterator,java.util.function.Predicate):34:37 -> a
-    9:21:boolean anyRemainingMatch(java.util.ListIterator,java.util.function.Predicate):57:69 -> a
-    1:3:java.lang.Object peekPrevious(java.util.ListIterator):17:19 -> b
-com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.utils.Y:
+    1:1:void <clinit>():16:16 -> <clinit>
+    1:1:java.util.Iterator filter(java.util.Iterator,java.util.function.Predicate):19:19 -> a
+    2:5:java.lang.Object peekNext(java.util.ListIterator):59:62 -> a
+    6:18:boolean anyRemainingMatch(java.util.ListIterator,java.util.function.Predicate):92:104 -> a
+    1:3:java.lang.Object peekPrevious(java.util.ListIterator):52:54 -> b
+    4:7:void removeIf(java.util.Iterator,java.util.function.Predicate):69:72 -> b
+com.android.tools.r8.utils.IteratorUtils$1 -> com.android.tools.r8.utils.W:
+    java.util.Iterator val$iterator -> b
+    java.util.function.Predicate val$predicate -> c
+    java.lang.Object next -> a
+    1:3:void <init>(java.util.Iterator,java.util.function.Predicate):19:21 -> <init>
+    1:3:java.lang.Object advance():25:27 -> f
+    1:1:boolean hasNext():36:36 -> hasNext
+    1:5:java.lang.Object next():41:45 -> next
+    6:6:java.lang.Object next():43:43 -> next
+com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.utils.Z:
     int columnCapacity -> b
     int rowCapacity -> a
     1:3:void <init>(int,int,float):31:33 -> <init>
@@ -62636,11 +63118,11 @@
     2:2:java.util.Map lambda$put$0(java.lang.Object):46:46 -> a
     3:4:java.lang.Object put(java.lang.Object,java.lang.Object,java.lang.Object):46:47 -> a
     1:1:boolean removeEldestEntry(java.util.Map$Entry):42:42 -> removeEldestEntry
-com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.utils.X:
+com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.utils.Y:
     int columnCapacity -> a
     1:2:void <init>(int,float):17:18 -> <init>
     1:1:boolean removeEldestEntry(java.util.Map$Entry):23:23 -> removeEldestEntry
-com.android.tools.r8.utils.LebUtils -> com.android.tools.r8.utils.Z:
+com.android.tools.r8.utils.LebUtils -> com.android.tools.r8.utils.a0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:6:int parseSleb128(com.android.tools.r8.dex.BinaryReader):65:70 -> a
@@ -62650,7 +63132,7 @@
     7:16:byte[] encodeUleb128(int):32:41 -> b
     17:21:void putUleb128(com.android.tools.r8.dex.DexOutputBuffer,int):48:52 -> b
     1:1:int sizeAsUleb128(int):57:57 -> c
-com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.utils.a0:
+com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.utils.b0:
     1:1:void <init>(com.android.tools.r8.utils.ClassProvider):15:15 -> <init>
     1:1:java.util.function.Supplier getTransparentSupplier(com.android.tools.r8.graph.DexClass):13:13 -> a
     2:2:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):13:13 -> a
@@ -62660,7 +63142,7 @@
     6:6:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):13 -> a
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():34:34 -> c
     1:1:java.lang.String toString():39:39 -> toString
-com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.utils.h0:
+com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.utils.i0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():54:54 -> <clinit>
     1:1:java.util.List com.android.tools.r8.graph.CfCode.getInstructions():131:131 -> a
@@ -62707,7 +63189,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):1097:1097 -> a
+    298:298:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1095:1095 -> 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
@@ -62736,7 +63218,7 @@
     331:333:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):379:381 -> a
     334:334:java.util.List lambda$groupMethodsByRenamedName$5(com.android.tools.r8.graph.DexString):380:380 -> a
     335:340:boolean doesContainPositions(com.android.tools.r8.graph.DexCode):401:406 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.utils.b0:
+com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.utils.c0:
     com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper val$positionRemapper -> i
     com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter val$positionEventEmitter -> h
     boolean $assertionsDisabled -> l
@@ -62755,11 +63237,11 @@
     32:33:void visit(com.android.tools.r8.graph.DexDebugEvent$EndLocal):502:503 -> a
     34:35:void visit(com.android.tools.r8.graph.DexDebugEvent$RestartLocal):508:509 -> a
     1:3:void flushPc():446:448 -> f
-com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.utils.c0:
+com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.utils.d0:
     1:1:void <init>():63:63 -> <init>
     2:2:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):63:63 -> <init>
     1:1:com.android.tools.r8.ir.code.Position createRemappedPosition(int,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):67:67 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.utils.d0:
+com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.utils.e0:
     int obfuscatedLine -> d
     int originalLine -> b
     com.android.tools.r8.ir.code.Position caller -> c
@@ -62770,7 +63252,7 @@
     1:1:int access$200(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):148:148 -> b
     1:1:int access$300(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):148:148 -> c
     1:1:com.android.tools.r8.ir.code.Position access$400(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):148:148 -> d
-com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.utils.e0:
+com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.utils.f0:
     boolean $assertionsDisabled -> e
     int nextOptimizedLineNumber -> d
     com.android.tools.r8.graph.DexMethod previousMethod -> b
@@ -62780,7 +63262,7 @@
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):77:77 -> <init>
     2:10:void <init>(com.android.tools.r8.utils.InternalOptions):73:81 -> <init>
     1:12:com.android.tools.r8.ir.code.Position createRemappedPosition(int,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):87:98 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.utils.f0:
+com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.utils.g0:
     java.util.List processedEvents -> f
     boolean $assertionsDisabled -> g
     int previousPc -> d
@@ -62798,9 +63280,15 @@
     3:15:void access$800(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int,com.android.tools.r8.ir.code.Position):105 -> a
     16:17:int getStartLine():142:143 -> a
     16:17:int access$900(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter):105 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.utils.g0:
+com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.utils.h0:
     com.android.tools.r8.ir.code.Position createRemappedPosition(int,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position) -> a
-com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.utils.i0:
+com.android.tools.r8.utils.ListUtils -> com.android.tools.r8.utils.j0:
+    1:1:void <clinit>():13:13 -> <clinit>
+    1:1:java.lang.Object first(java.util.List):16:16 -> a
+    2:3:int lastIndexMatching(java.util.List,java.util.function.Predicate):25:26 -> a
+    4:6:java.util.List map(java.util.Collection,java.util.function.Function):34:36 -> a
+    1:2:boolean verifyListIsOrdered(java.util.List):42:43 -> b
+com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.utils.k0:
     long max -> b
     long min -> a
     boolean $assertionsDisabled -> c
@@ -62816,7 +63304,7 @@
     1:2:boolean equals(java.lang.Object):66:67 -> equals
     1:1:int hashCode():58:58 -> hashCode
     1:1:java.lang.String toString():74:74 -> toString
-com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.utils.j0:
+com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.utils.l0:
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE -> b
     boolean ignoreName -> a
@@ -62838,7 +63326,7 @@
     11:11:int doHash(java.lang.Object):15 -> a
     1:1:com.android.tools.r8.utils.MethodJavaSignatureEquivalence get():30:30 -> c
     1:1:com.android.tools.r8.utils.MethodJavaSignatureEquivalence getEquivalenceIgnoreName():34:34 -> d
-com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.utils.k0:
+com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.utils.m0:
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE -> b
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     boolean ignoreName -> a
@@ -62852,14 +63340,14 @@
     7:10:int doHash(java.lang.Object):14 -> a
     1:1:com.android.tools.r8.utils.MethodSignatureEquivalence get():28:28 -> c
     1:1:com.android.tools.r8.utils.MethodSignatureEquivalence getEquivalenceIgnoreName():32:32 -> d
-com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.utils.l0:
+com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.utils.n0:
     com.android.tools.r8.utils.OffOrAuto Auto -> b
     com.android.tools.r8.utils.OffOrAuto Off -> a
     com.android.tools.r8.utils.OffOrAuto[] $VALUES -> c
     1:1:void <clinit>():11:11 -> <clinit>
     2:2:void <clinit>():10:10 -> <clinit>
     1:1:void <init>(java.lang.String,int):10:10 -> <init>
-com.android.tools.r8.utils.OneShotByteResource -> com.android.tools.r8.utils.m0:
+com.android.tools.r8.utils.OneShotByteResource -> com.android.tools.r8.utils.o0:
     com.android.tools.r8.origin.Origin origin -> a
     java.util.Set classDescriptors -> d
     boolean $assertionsDisabled -> e
@@ -62872,7 +63360,7 @@
     1:1:java.util.Set getClassDescriptors():54:54 -> getClassDescriptors
     1:1:com.android.tools.r8.ProgramResource$Kind getKind():41:41 -> getKind
     1:1:com.android.tools.r8.origin.Origin getOrigin():36:36 -> getOrigin
-com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.utils.n0:
+com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.utils.p0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:13:java.lang.String tryParseSingle(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String,java.lang.String):37:49 -> a
@@ -62880,14 +63368,14 @@
     19:19:java.lang.String tryParseSingle(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String,java.lang.String):41:41 -> a
     20:27:java.lang.Boolean tryParseBoolean(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String):60:67 -> a
     1:11:java.util.List tryParseMulti(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String):18:28 -> b
-com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.utils.n0$a:
+com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.utils.p0$a:
     java.lang.String[] args -> a
     int nextIndex -> b
     1:1:void <init>(java.lang.String[]):76:76 -> <init>
     2:5:void <init>(java.lang.String[]):74:77 -> <init>
     1:1:java.lang.String head():81:81 -> a
     1:5:java.lang.String next():85:89 -> b
-com.android.tools.r8.utils.OrderedMergingIterator -> com.android.tools.r8.utils.o0:
+com.android.tools.r8.utils.OrderedMergingIterator -> com.android.tools.r8.utils.q0:
     java.util.List other -> b
     java.util.List one -> a
     int otherIndex -> d
@@ -62910,14 +63398,14 @@
     17:17:com.android.tools.r8.graph.KeyedDexItem next():44 -> next
     18:25:com.android.tools.r8.graph.KeyedDexItem next():46:53 -> next
     26:26:com.android.tools.r8.graph.KeyedDexItem next():51:51 -> next
-com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.utils.p0:
+com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.utils.r0:
     void addDirectory(java.lang.String,com.android.tools.r8.DiagnosticsHandler) -> a
     void addFile(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler) -> a
     void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler) -> a
     void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler) -> a
     void close(com.android.tools.r8.DiagnosticsHandler) -> a
     java.nio.file.Path getPath() -> a
-com.android.tools.r8.utils.Pair -> com.android.tools.r8.utils.q0:
+com.android.tools.r8.utils.Pair -> com.android.tools.r8.utils.s0:
     java.lang.Object second -> b
     java.lang.Object first -> a
     1:3:void <init>(java.lang.Object,java.lang.Object):23:25 -> <init>
@@ -62927,35 +63415,35 @@
     2:2:void setSecond(java.lang.Object):41:41 -> b
     1:1:boolean equals(java.lang.Object):51:51 -> equals
     1:1:int hashCode():46:46 -> hashCode
-com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.utils.r0:
+com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.utils.t0:
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver conflictResolver -> d
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():23:23 -> <clinit>
-    1:2:void <init>(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):41:42 -> <init>
-    1:1:java.util.function.Supplier getTransparentSupplier(com.android.tools.r8.graph.DexClass):23:23 -> a
-    2:2:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):23:23 -> a
-    3:3:com.android.tools.r8.graph.DexProgramClass resolveClassConflict(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):52:52 -> a
-    3:3:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):23 -> a
-    4:9:com.android.tools.r8.utils.ProgramClassCollection create(java.util.List,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):30:35 -> a
-    10:10:java.util.function.Supplier lambda$create$0(com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver,java.util.function.Supplier,java.util.function.Supplier):33:33 -> a
-    11:11:com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver disallowClassConflictsResolver(com.android.tools.r8.utils.Reporter):66:66 -> a
-    12:17: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):67:72 -> a
-    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():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
-    26:26:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):79 -> a
+    1:1:void <clinit>():24:24 -> <clinit>
+    1:2:void <init>(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):42:43 -> <init>
+    1:1:java.util.function.Supplier getTransparentSupplier(com.android.tools.r8.graph.DexClass):24:24 -> a
+    2:2:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):24:24 -> a
+    3:3:com.android.tools.r8.graph.DexProgramClass resolveClassConflict(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):53:53 -> a
+    3:3:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):24 -> a
+    4:9:com.android.tools.r8.utils.ProgramClassCollection create(java.util.List,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):31:36 -> a
+    10:10:java.util.function.Supplier lambda$create$0(com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver,java.util.function.Supplier,java.util.function.Supplier):34:34 -> a
+    11:11:com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver disallowClassConflictsResolver(com.android.tools.r8.utils.Reporter):67:67 -> a
+    12:17: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):68:73 -> a
+    18:23:boolean assumeClassesAreEqual(com.android.tools.r8.graph.DexProgramClass):85:90 -> a
+    18: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):74 -> 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):77:77 -> a
+    25:25:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> 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):79 -> a
+    26:26:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):79:79 -> a
     27:27:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    27:27:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):79 -> a
-    28:28:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):79:79 -> a
-    29:31:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    29:31:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):76 -> a
-    1:1:com.android.tools.r8.graph.ClassKind getClassKind():62:62 -> c
-    1:1:java.lang.String toString():47:47 -> toString
-com.android.tools.r8.utils.Reporter -> com.android.tools.r8.utils.t0:
+    27:27:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):80 -> a
+    28:28:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
+    28:28:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):80 -> a
+    29:29:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):80:80 -> a
+    30:32:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
+    30:32:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77 -> a
+    1:1:com.android.tools.r8.graph.ClassKind getClassKind():63:63 -> c
+    1:1:java.lang.String toString():48:48 -> toString
+com.android.tools.r8.utils.Reporter -> com.android.tools.r8.utils.v0:
     com.android.tools.r8.DiagnosticsHandler clientHandler -> a
     com.android.tools.r8.Diagnostic lastError -> c
     java.util.Collection suppressedExceptions -> d
@@ -62967,15 +63455,18 @@
     2:5:void error(com.android.tools.r8.Diagnostic,java.lang.Throwable):53:56 -> a
     6:24:void failIfPendingErrors():89:107 -> a
     25:25:java.lang.Throwable addSuppressedExceptions(java.lang.Throwable):111:111 -> a
-    1:1:java.lang.RuntimeException fatalError(java.lang.String):63:63 -> b
-    2:4:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic):71:73 -> b
-    2:4:java.lang.RuntimeException fatalError(java.lang.String):63 -> b
+    1:4:void error(com.android.tools.r8.Diagnostic,java.lang.Throwable):53:56 -> b
+    1:4:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic,java.lang.Throwable):80 -> b
+    5:6:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic,java.lang.Throwable):81:82 -> b
+    7:7:java.lang.RuntimeException fatalError(java.lang.String):63:63 -> b
+    8:10:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic):71:73 -> b
+    8:10:java.lang.RuntimeException fatalError(java.lang.String):63 -> b
     1:3:void error(com.android.tools.r8.Diagnostic):43:45 -> error
     1:1:void info(com.android.tools.r8.Diagnostic):33:33 -> info
     1:1:void warning(com.android.tools.r8.Diagnostic):38:38 -> warning
-com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.utils.s0:
+com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.utils.u0:
     1:1:void <init>():24:24 -> <init>
-com.android.tools.r8.utils.SingletonEquivalence -> com.android.tools.r8.utils.u0:
+com.android.tools.r8.utils.SingletonEquivalence -> com.android.tools.r8.utils.w0:
     1:1:void <init>():11:11 -> <init>
     boolean doEquivalent(java.lang.Object,java.lang.Object) -> a
     int doHash(java.lang.Object) -> a
@@ -62989,7 +63480,7 @@
     1:1:java.lang.String getDiagnosticMessage():53:53 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():43:43 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():48:48 -> getPosition
-com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.utils.v0:
+com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.utils.x0:
     char[] EMPTY_CHAR_ARRAY -> a
     java.lang.String LINE_SEPARATOR -> c
     java.lang.String[] EMPTY_ARRAY -> b
@@ -63022,7 +63513,7 @@
     1:2:java.lang.String stripLeadingBOM(java.lang.String):279:280 -> c
     1:9:java.lang.String toASCIIString(java.lang.String):49:57 -> d
     1:9:java.lang.String trim(java.lang.String):288:296 -> e
-com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.utils.v0$a:
+com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.utils.x0$a:
     com.android.tools.r8.utils.StringUtils$BraceType SQUARE -> b
     com.android.tools.r8.utils.StringUtils$BraceType TUBORG -> c
     com.android.tools.r8.utils.StringUtils$BraceType PARENS -> a
@@ -63031,7 +63522,7 @@
     1:4:void <clinit>():22:25 -> <clinit>
     5:5:void <clinit>():21:21 -> <clinit>
     1:1:void <init>(java.lang.String,int):21:21 -> <init>
-com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.utils.x0:
+com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.utils.z0:
     char[] IDENTIFIER_CHARACTERS -> b
     boolean $assertionsDisabled -> e
     java.util.Set PRIMITIVE_TYPE_NAMES -> a
@@ -63040,31 +63531,31 @@
     1:15:void <clinit>():13:27 -> <clinit>
     1:1:java.lang.String numberToIdentifier(int,com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing):31:31 -> a
     2:35:java.lang.String numberToIdentifier(int,com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing,char[],boolean):43:76 -> a
-com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.utils.w0:
+com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.utils.y0:
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing DONT_USE_MIXED_CASE -> b
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing USE_MIXED_CASE -> a
     1:2:void <clinit>():16:17 -> <clinit>
     1:1:void <init>(java.lang.String,int):15:15 -> <init>
-com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.utils.y0:
-com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.utils.z0:
+com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.utils.A0:
+com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.utils.B0:
     char nextChar() -> a
-com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.utils.A0:
-com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.utils.B0:
+com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.utils.C0:
+com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.utils.D0:
     1:1:void <init>():9:9 -> <init>
     boolean hasNext() -> a
     1:4:int nextIntComputeIfAbsent(com.android.tools.r8.utils.ThrowingIntSupplier):22:25 -> a
     int nextInt() -> b
-com.android.tools.r8.utils.ThrowingIntSupplier -> com.android.tools.r8.utils.C0:
+com.android.tools.r8.utils.ThrowingIntSupplier -> com.android.tools.r8.utils.E0:
     int getAsInt() -> a
-com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.utils.D0:
+com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.utils.F0:
     1:1:void <init>():11:11 -> <init>
     boolean hasNext() -> a
     1:4:java.lang.Object computeNextIfAbsent(com.android.tools.r8.utils.ThrowingSupplier):18:21 -> a
     5:10:java.util.List take(int):25:30 -> a
     11:11:java.util.List take(int):28:28 -> a
     java.lang.Object next() -> b
-com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.utils.E0:
-com.android.tools.r8.utils.Timing -> com.android.tools.r8.utils.H0:
+com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.utils.G0:
+com.android.tools.r8.utils.Timing -> com.android.tools.r8.utils.J0:
     java.util.Stack stack -> a
     boolean trackMemory -> b
     1:1:void <init>(java.lang.String):31:31 -> <init>
@@ -63097,10 +63588,10 @@
     12:12:java.util.Map access$100(com.android.tools.r8.utils.Timing):21 -> b
     13:13:java.util.Map computeMemoryInformation():211:211 -> b
     13:13:java.util.Map access$100(com.android.tools.r8.utils.Timing):21 -> b
-com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.utils.F0:
+com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.utils.H0:
     long used -> a
     1:2:void <init>(long):43:44 -> <init>
-com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.utils.G0:
+com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.utils.I0:
     com.android.tools.r8.utils.Timing this$0 -> g
     java.util.Map children -> b
     java.lang.String title -> a
@@ -63147,9 +63638,9 @@
     3:3:java.lang.String com.android.tools.r8.utils.Timing.access$200(long):21 -> toString
     3:3:java.lang.String toString():96 -> toString
     4:4:java.lang.String toString():96:96 -> toString
-com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.utils.I0:
+com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.utils.K0:
     java.lang.Object apply(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.utils.J0:
+com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.utils.L0:
     com.android.tools.r8.utils.VersionProperties INSTANCE -> c
     java.lang.String sha -> a
     java.lang.String releaser -> b
diff --git a/compatproguard-master.jar b/compatproguard-master.jar
index 8e1cbe4..28a63d3 100644
--- a/compatproguard-master.jar
+++ b/compatproguard-master.jar
Binary files differ
diff --git a/compatproguard-master.jar.map b/compatproguard-master.jar.map
index fcfe2e2..f483619 100644
--- a/compatproguard-master.jar.map
+++ b/compatproguard-master.jar.map
@@ -1,7 +1,7 @@
 # compiler: R8
-# compiler_version: 1.7.7-dev
+# compiler_version: 1.7.12-dev
 # compiler_hash: engineering
-# pg_map_id: a0a1cbb
+# pg_map_id: a55b232
 # common_typos_disable
 com.android.tools.r8.ApiLevelException -> com.android.tools.r8.a:
     boolean $assertionsDisabled -> c
@@ -173,19 +173,19 @@
     com.android.tools.r8.StringConsumer mainDexListConsumer -> g
     com.android.tools.r8.ProgramConsumer programConsumer -> f
     com.android.tools.r8.CompilationMode mode -> e
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:10:void <init>(boolean,boolean):44:53 -> <init>
-    11:22:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean,java.util.function.BiPredicate):67:78 -> <init>
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:10:void <init>(boolean,boolean):43:52 -> <init>
+    11:22:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean,java.util.function.BiPredicate):66:77 -> <init>
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:1:com.android.tools.r8.utils.Reporter getReporter():134:134 -> b
-    1:1:java.util.function.BiPredicate getDexClassChecksumFilter():122:122 -> getDexClassChecksumFilter
-    1:1:boolean getEnableDesugaring():112:112 -> getEnableDesugaring
-    1:1:boolean getIncludeClassesChecksum():117:117 -> getIncludeClassesChecksum
-    1:1:com.android.tools.r8.StringConsumer getMainDexListConsumer():107:107 -> getMainDexListConsumer
-    1:1:int getMinApiLevel():91:91 -> getMinApiLevel
-    1:1:com.android.tools.r8.CompilationMode getMode():86:86 -> getMode
-    1:1:com.android.tools.r8.ProgramConsumer getProgramConsumer():100:100 -> getProgramConsumer
-    1:1:boolean isOptimizeMultidexForLinearAlloc():130:130 -> isOptimizeMultidexForLinearAlloc
+    1:1:com.android.tools.r8.utils.Reporter getReporter():133:133 -> b
+    1:1:java.util.function.BiPredicate getDexClassChecksumFilter():121:121 -> getDexClassChecksumFilter
+    1:1:boolean getEnableDesugaring():111:111 -> getEnableDesugaring
+    1:1:boolean getIncludeClassesChecksum():116:116 -> getIncludeClassesChecksum
+    1:1:com.android.tools.r8.StringConsumer getMainDexListConsumer():106:106 -> getMainDexListConsumer
+    1:1:int getMinApiLevel():90:90 -> getMinApiLevel
+    1:1:com.android.tools.r8.CompilationMode getMode():85:85 -> getMode
+    1:1:com.android.tools.r8.ProgramConsumer getProgramConsumer():99:99 -> getProgramConsumer
+    1:1:boolean isOptimizeMultidexForLinearAlloc():129:129 -> isOptimizeMultidexForLinearAlloc
 com.android.tools.r8.BaseCompilerCommand$Builder -> com.android.tools.r8.BaseCompilerCommand$Builder:
     boolean includeClassesChecksum -> n
     java.util.function.BiPredicate dexClassChecksumFilter -> p
@@ -199,58 +199,60 @@
     com.android.tools.r8.OutputMode outputMode -> i
     boolean $assertionsDisabled -> q
     java.util.List desugaredLibraryConfigurationResources -> m
-    1:1:void <clinit>():144:144 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler):170:170 -> <init>
-    2:25:void <init>(com.android.tools.r8.DiagnosticsHandler):148:171 -> <init>
+    1:1:void <clinit>():143:143 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler):169:169 -> <init>
+    2:25:void <init>(com.android.tools.r8.DiagnosticsHandler):147:170 -> <init>
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:33:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):349:381 -> a
-    34:45:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):451:462 -> a
-    46:46:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):455:455 -> a
+    1:33:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):348:380 -> a
+    34:45:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):450:461 -> a
+    46:46:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):454:454 -> a
     47:47:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    47:47:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):455 -> a
+    47:47:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):454 -> a
     48:48:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     48:48:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    48:48:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):455 -> a
-    49:49:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):455:455 -> a
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):438:439 -> addDesugaredLibraryConfiguration
-    3:5:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):438:440 -> addDesugaredLibraryConfiguration
-    6:7:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(com.android.tools.r8.StringResource):445:446 -> addDesugaredLibraryConfiguration
-    1:1:com.android.tools.r8.BaseCompilerCommand$Builder addSpecialLibraryConfiguration(java.lang.String):432:432 -> addSpecialLibraryConfiguration
-    1:32:void validate():482:513 -> e
+    48:48:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):454 -> a
+    49:49:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):454:454 -> a
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):437:438 -> addDesugaredLibraryConfiguration
+    3:3:com.android.tools.r8.StringResource com.android.tools.r8.StringResource.fromString(java.lang.String,com.android.tools.r8.origin.Origin):26:26 -> addDesugaredLibraryConfiguration
+    3:3:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):438 -> addDesugaredLibraryConfiguration
+    4:6:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):437:439 -> addDesugaredLibraryConfiguration
+    7:8:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(com.android.tools.r8.StringResource):444:445 -> addDesugaredLibraryConfiguration
+    1:1:com.android.tools.r8.BaseCompilerCommand$Builder addSpecialLibraryConfiguration(java.lang.String):431:431 -> addSpecialLibraryConfiguration
+    1:29:void validate():481:509 -> e
     com.android.tools.r8.CompilationMode defaultCompilationMode() -> f
-    1:1:boolean hasDesugaredLibraryConfiguration():466:466 -> 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:boolean hasDesugaredLibraryConfiguration():465:465 -> g
+    1:1:java.util.function.BiPredicate getDexClassChecksumFilter():243:243 -> getDexClassChecksumFilter
+    1:1:boolean getDisableDesugaring():426:426 -> getDisableDesugaring
+    1:1:boolean getIncludeClassesChecksum():476:476 -> getIncludeClassesChecksum
+    1:1:com.android.tools.r8.StringConsumer getMainDexListConsumer():236:236 -> getMainDexListConsumer
+    1:1:boolean isMinApiLevelSet():389:389 -> getMinApiLevel
+    1:1:int getMinApiLevel():385 -> getMinApiLevel
+    2:2:int getMinApiLevel():385:385 -> 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
-    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 isMinApiLevelSet():390:390 -> h
-    1:1:boolean isOptimizeMultidexForLinearAlloc():262:262 -> i
-    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
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setIncludeClassesChecksum(boolean):471:472 -> setIncludeClassesChecksum
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setMainDexListConsumer(com.android.tools.r8.StringConsumer):305:306 -> setMainDexListConsumer
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setMainDexListOutputPath(java.nio.file.Path):292:293 -> setMainDexListOutputPath
-    1:5:com.android.tools.r8.BaseCompilerCommand$Builder setMinApiLevel(int):396:400 -> setMinApiLevel
-    1:3:com.android.tools.r8.BaseCompilerCommand$Builder setMode(com.android.tools.r8.CompilationMode):197:199 -> setMode
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setOptimizeMultidexForLinearAlloc(boolean):253:254 -> setOptimizeMultidexForLinearAlloc
-    1:1:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):320:320 -> setOutput
-    2:7:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):325:330 -> setOutput
-    1:4:com.android.tools.r8.BaseCompilerCommand$Builder setProgramConsumer(com.android.tools.r8.ProgramConsumer):276:279 -> setProgramConsumer
+    3:3:int getMinApiLevel():385 -> getMinApiLevel
+    4:4:int getMinApiLevel():385:385 -> getMinApiLevel
+    1:1:com.android.tools.r8.CompilationMode getMode():189:189 -> getMode
+    1:1:com.android.tools.r8.OutputMode getOutputMode():218:218 -> getOutputMode
+    1:1:java.nio.file.Path getOutputPath():208:208 -> getOutputPath
+    1:1:com.android.tools.r8.ProgramConsumer getProgramConsumer():229:229 -> getProgramConsumer
+    1:1:boolean isMinApiLevelSet():389:389 -> h
+    1:1:boolean isOptimizeMultidexForLinearAlloc():261:261 -> i
+    1:3:com.android.tools.r8.BaseCompilerCommand$Builder setDexClassChecksumFilter(java.util.function.BiPredicate):339:341 -> setDexClassChecksumFilter
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setDisableDesugaring(boolean):420:421 -> setDisableDesugaring
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setEnableDesugaring(boolean):404:405 -> setEnableDesugaring
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setIncludeClassesChecksum(boolean):470:471 -> setIncludeClassesChecksum
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setMainDexListConsumer(com.android.tools.r8.StringConsumer):304:305 -> setMainDexListConsumer
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setMainDexListOutputPath(java.nio.file.Path):291:292 -> setMainDexListOutputPath
+    1:5:com.android.tools.r8.BaseCompilerCommand$Builder setMinApiLevel(int):395:399 -> setMinApiLevel
+    1:3:com.android.tools.r8.BaseCompilerCommand$Builder setMode(com.android.tools.r8.CompilationMode):196:198 -> setMode
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setOptimizeMultidexForLinearAlloc(boolean):252:253 -> setOptimizeMultidexForLinearAlloc
+    1:1:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):319:319 -> setOutput
+    2:7:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):324:329 -> setOutput
+    1:4:com.android.tools.r8.BaseCompilerCommand$Builder setProgramConsumer(com.android.tools.r8.ProgramConsumer):275:278 -> setProgramConsumer
 com.android.tools.r8.BaseCompilerCommand$Builder$1 -> com.android.tools.r8.BaseCompilerCommand$Builder$a:
-    1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):356:356 -> <init>
+    1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):355:355 -> <init>
 com.android.tools.r8.BaseCompilerCommand$Builder$2 -> com.android.tools.r8.BaseCompilerCommand$Builder$b:
-    1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):363:363 -> <init>
+    1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):362:362 -> <init>
 com.android.tools.r8.BaseCompilerCommandParser -> com.android.tools.r8.b:
     1:1:void <init>():9:9 -> <init>
     1:10:void parseMinApi(com.android.tools.r8.BaseCompilerCommand$Builder,java.lang.String,com.android.tools.r8.origin.Origin):14:23 -> a
@@ -352,7 +354,7 @@
     19:19:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):187:187 -> a
     20:20:void lambda$run$4(java.lang.String):197:197 -> a
     21:23:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):244:246 -> a
-    24:24:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):363:363 -> a
+    24:24:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):358:358 -> a
     24:24:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):246 -> a
     25:29:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):247:251 -> a
     1:1:void lambda$run$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):102:102 -> b
@@ -361,7 +363,7 @@
     2:2:void com.android.tools.r8.utils.Timing.<init>(java.lang.String):31:31 -> d
     2:2:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):150 -> d
     3:26:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):153:176 -> d
-    27:27:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):359:359 -> d
+    27:27:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):354:354 -> d
     27:27:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):176 -> d
     28:38:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):177:187 -> d
     39:43:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):183:187 -> d
@@ -369,7 +371,7 @@
     83:83:com.android.tools.r8.dex.ClassesChecksum com.android.tools.r8.graph.DexApplication.getChecksums():112:112 -> d
     83:83:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):220 -> d
     84:85:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):221:222 -> d
-    86:86: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 -> d
+    86:86:void com.android.tools.r8.dex.ApplicationWriter.<init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,java.util.List,com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):151:151 -> d
     86:86:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):222 -> d
     87:95:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):224:232 -> d
     96:101:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):227:232 -> d
@@ -562,7 +564,7 @@
     16:16:void com.android.tools.r8.utils.Timing.<init>(java.lang.String):31:31 -> a
     16:16:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):84 -> a
     17:37:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):85:105 -> a
-    38:38: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
+    38:38:void com.android.tools.r8.dex.ApplicationWriter.<init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,java.util.List,com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):151:151 -> a
     38:38:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):105 -> a
     39:47:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):107:115 -> a
     48:53:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):110:115 -> a
@@ -679,13 +681,15 @@
     1:7:void deleteClassesDexFiles(java.nio.file.Path):280:286 -> a
     8:14:void deleteClassesDexFiles(java.nio.file.Path):280:286 -> a
     15:15:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):286:286 -> a
-    1:7:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):246:252 -> accept
-    8:8:java.lang.String com.android.tools.r8.DexIndexedConsumer$ForwardingConsumer.getDexFileName(int):97:97 -> accept
-    8:8:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):252 -> accept
-    9:9:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):252:252 -> accept
-    10:10:void accept(com.android.tools.r8.DataDirectoryResource,com.android.tools.r8.DiagnosticsHandler):257:257 -> accept
-    11:11:void accept(com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):262:262 -> accept
-    1:5:void prepareDirectory():272:276 -> b
+    1:1:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):246:246 -> accept
+    2:6:void prepareDirectory():272:276 -> accept
+    2:6:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):248 -> accept
+    7:9:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):250:252 -> accept
+    10:10:java.lang.String com.android.tools.r8.DexIndexedConsumer$ForwardingConsumer.getDexFileName(int):97:97 -> accept
+    10:10:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):252 -> accept
+    11:11:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):252:252 -> accept
+    12:12:void accept(com.android.tools.r8.DataDirectoryResource,com.android.tools.r8.DiagnosticsHandler):257:257 -> accept
+    13:13:void accept(com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):262:262 -> accept
     1:2:void finished(com.android.tools.r8.DiagnosticsHandler):267:268 -> finished
     1:1:com.android.tools.r8.DataResourceConsumer getDataResourceConsumer():240:240 -> getDataResourceConsumer
     1:1:java.nio.file.Path internalGetOutputPath():312:312 -> internalGetOutputPath
@@ -920,17 +924,18 @@
 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(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
+    java.lang.String outline10(java.lang.StringBuilder,java.lang.String,java.lang.String) -> a
+    java.lang.StringBuilder outline11(com.android.tools.r8.graph.DexType,java.lang.StringBuilder,java.lang.String) -> a
+    java.lang.StringBuilder outline12(java.lang.String) -> a
+    java.lang.StringBuilder outline13(java.lang.String,int,java.lang.String) -> a
     com.android.tools.r8.ir.code.BasicBlock outline2(com.android.tools.r8.ir.code.BasicBlock) -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type outline3(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type) -> a
-    java.lang.String 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
+    java.lang.String outline4(com.android.tools.r8.graph.DexMethod,java.lang.StringBuilder,java.lang.String) -> a
+    java.lang.String outline6(java.lang.String,int) -> a
+    java.lang.String outline8(java.lang.String,java.lang.String) -> a
+    java.lang.String outline9(java.lang.StringBuilder,int,java.lang.String) -> a
+    java.lang.String outline5(com.android.tools.r8.graph.DexType,java.lang.StringBuilder,java.lang.String) -> b
+    java.lang.String outline7(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
@@ -947,12 +952,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):354:354 -> a
+    28:28:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):349:349 -> a
     28:28:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):123 -> a
     28:28:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
     29:41:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):125:137 -> a
     29:41:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
-    42:42:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():342:342 -> a
+    42:42:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():344:344 -> a
     42:42:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):139 -> a
     42:42:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
     43:51:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):139:147 -> a
@@ -1098,13 +1103,13 @@
     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():330:330 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     7:7:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):195 -> a
     8:8:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):196:196 -> a
-    9:9:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():342:342 -> a
+    9:9:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():344:344 -> a
     9:9:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):198 -> a
     10:16:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):198:204 -> a
-    17:17:void com.android.tools.r8.dex.ApplicationWriter.<init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,java.util.List,com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):150:150 -> a
+    17:17:void com.android.tools.r8.dex.ApplicationWriter.<init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,java.util.List,com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):151:151 -> a
     17:17:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):204 -> a
     18:21: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):209:212 -> a
     22:23:java.util.Set filterMissingClasses(java.util.Set,com.android.tools.r8.shaking.ProguardClassFilter):218:219 -> a
@@ -1156,37 +1161,37 @@
     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
+    1236:1241:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):853:858 -> a
+    1242: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):856:861 -> a
+    1248:1248:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22: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):861 -> a
+    1249:1249:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1249:1249:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> 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):861 -> a
+    1250:1250:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):861:861 -> a
+    1251:1254:void computeKotlinInfoForProgramClasses(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):865:868 -> a
+    1255:1255:void lambda$run$12(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):887:887 -> a
+    1256:1256:void lambda$main$13(java.lang.String[]):903:903 -> 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[]):872:873 -> b
+    4:5:void run(java.lang.String[]):873:874 -> b
     6:6:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> b
-    6:6:void run(java.lang.String[]):874 -> b
-    7:7:void run(java.lang.String[]):875:875 -> b
+    6:6:void run(java.lang.String[]):875 -> b
+    7:7:void run(java.lang.String[]):876:876 -> 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[]):874 -> b
-    9:13:void run(java.lang.String[]):878:882 -> b
+    8:8:void run(java.lang.String[]):875 -> b
+    9:13:void run(java.lang.String[]):879:883 -> 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[]):883 -> b
-    15:15:void run(java.lang.String[]):885:885 -> b
+    14:14:void run(java.lang.String[]):884 -> b
+    15:15:void run(java.lang.String[]):886:886 -> 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
+    16:16:void run(java.lang.String[]):886 -> b
+    17:17:void run(java.lang.String[]):889:889 -> 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[]):898:902 -> main
+    1:5:void main(java.lang.String[]):899:903 -> 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):55:55 -> run
@@ -1210,28 +1215,28 @@
     com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration libraryConfiguration -> C
     java.lang.String USAGE_MESSAGE -> E
     com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> B
-    1:558:void <clinit>():56:613 -> <clinit>
+    1:559:void <clinit>():56:614 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ProgramConsumer,java.util.List,com.android.tools.r8.StringConsumer,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.CompilationMode,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean,boolean,boolean,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,java.util.function.Consumer,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.R8Command$1):57:57 -> <init>
     2:2:void <init>(boolean,boolean,com.android.tools.r8.R8Command$1):57:57 -> <init>
-    3:31:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ProgramConsumer,java.util.List,com.android.tools.r8.StringConsumer,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.CompilationMode,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean,boolean,boolean,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,java.util.function.Consumer,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,com.android.tools.r8.features.FeatureSplitConfiguration):706:734 -> <init>
-    32:48:void <init>(boolean,boolean):738:754 -> <init>
-    1:3:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):881:883 -> a
-    1:1:com.android.tools.r8.R8Command$Builder builder():634:634 -> builder
-    2:2:void com.android.tools.r8.R8Command$Builder.<init>():108:108 -> builder
-    2:2:com.android.tools.r8.R8Command$Builder builder():634 -> builder
-    3:3:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):639:639 -> builder
-    1:53:com.android.tools.r8.utils.InternalOptions getInternalOptions():769:821 -> c
-    54:64:com.android.tools.r8.utils.InternalOptions getInternalOptions():818:828 -> c
-    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():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
-    1:1:boolean getEnableTreeShaking():759:759 -> getEnableTreeShaking
-    1:1:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):662:662 -> parse
-    2:2:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):676:676 -> parse
+    3:31:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ProgramConsumer,java.util.List,com.android.tools.r8.StringConsumer,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.CompilationMode,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean,boolean,boolean,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,java.util.function.Consumer,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,com.android.tools.r8.features.FeatureSplitConfiguration):707:735 -> <init>
+    32:48:void <init>(boolean,boolean):739:755 -> <init>
+    1:3:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):882:884 -> a
+    1:1:com.android.tools.r8.R8Command$Builder builder():635:635 -> builder
+    2:2:void com.android.tools.r8.R8Command$Builder.<init>():109:109 -> builder
+    2:2:com.android.tools.r8.R8Command$Builder builder():635 -> builder
+    3:3:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):640:640 -> builder
+    1:53:com.android.tools.r8.utils.InternalOptions getInternalOptions():770:822 -> c
+    54:64:com.android.tools.r8.utils.InternalOptions getInternalOptions():819:829 -> c
+    65:75:com.android.tools.r8.utils.InternalOptions getInternalOptions():826:836 -> c
+    76:86:com.android.tools.r8.utils.InternalOptions getInternalOptions():833:843 -> c
+    87:104:com.android.tools.r8.utils.InternalOptions getInternalOptions():840:857 -> c
+    105:105:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> c
+    105:105:com.android.tools.r8.utils.InternalOptions getInternalOptions():858 -> c
+    106:120:com.android.tools.r8.utils.InternalOptions getInternalOptions():859:873 -> c
+    1:1:boolean getEnableMinification():765:765 -> getEnableMinification
+    1:1:boolean getEnableTreeShaking():760:760 -> getEnableTreeShaking
+    1:1:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):663:663 -> parse
+    2:2:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):677:677 -> parse
 com.android.tools.r8.R8Command$1 -> com.android.tools.r8.R8Command$a:
 com.android.tools.r8.R8Command$Builder -> com.android.tools.r8.R8Command$Builder:
     java.util.List mainDexRules -> r
@@ -1253,75 +1258,75 @@
     com.android.tools.r8.StringConsumer proguardMapConsumer -> A
     com.android.tools.r8.StringConsumer proguardUsageConsumer -> B
     1:1:void <clinit>():64:64 -> <clinit>
-    1:1:void <init>():108:108 -> <init>
-    2:2:void <init>(com.android.tools.r8.DiagnosticsHandler):112:112 -> <init>
-    3:22:void <init>(com.android.tools.r8.DiagnosticsHandler):85:104 -> <init>
+    1:1:void <init>():109:109 -> <init>
+    2:2:void <init>(com.android.tools.r8.DiagnosticsHandler):113:113 -> <init>
+    3:23:void <init>(com.android.tools.r8.DiagnosticsHandler):85:105 -> <init>
     1:1:java.lang.Boolean lambda$new$0(java.lang.String,java.lang.Long):100:100 -> a
-    2:3:void lambda$addMainDexRulesFiles$1(java.nio.file.Path[]):168:169 -> a
-    4:5:void lambda$addMainDexRulesFiles$2(java.util.Collection):178:179 -> a
-    6:7:void lambda$addMainDexRules$3(java.util.List,com.android.tools.r8.origin.Origin):187:188 -> a
-    8:8:void lambda$addMainDexRules$3(java.util.List,com.android.tools.r8.origin.Origin):187:187 -> a
-    9:10:void lambda$addProguardConfigurationFiles$5(java.util.List):205:206 -> a
-    11:11:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):376:376 -> a
-    12:14:void lambda$makeR8Command$7(com.android.tools.r8.DataResourceProvider$Visitor,com.android.tools.r8.utils.Reporter,com.android.tools.r8.DataResourceProvider):495:497 -> a
-    1:1:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):365:365 -> addFeatureSplit
+    2:3:void lambda$addMainDexRulesFiles$1(java.nio.file.Path[]):169:170 -> a
+    4:5:void lambda$addMainDexRulesFiles$2(java.util.Collection):179:180 -> a
+    6:7:void lambda$addMainDexRules$3(java.util.List,com.android.tools.r8.origin.Origin):188:189 -> a
+    8:8:void lambda$addMainDexRules$3(java.util.List,com.android.tools.r8.origin.Origin):188:188 -> a
+    9:10:void lambda$addProguardConfigurationFiles$5(java.util.List):206:207 -> a
+    11:11:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):377:377 -> a
+    12:14:void lambda$makeR8Command$7(com.android.tools.r8.DataResourceProvider$Visitor,com.android.tools.r8.utils.Reporter,com.android.tools.r8.DataResourceProvider):496:498 -> a
+    1:1:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):366:366 -> addFeatureSplit
     2:2:com.android.tools.r8.FeatureSplit$Builder com.android.tools.r8.FeatureSplit.builder(com.android.tools.r8.DiagnosticsHandler):50:50 -> addFeatureSplit
-    2:2:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):365 -> addFeatureSplit
-    3:5:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):365:367 -> addFeatureSplit
-    1:1:com.android.tools.r8.R8Command$Builder addMainDexRules(java.util.List,com.android.tools.r8.origin.Origin):187:187 -> addMainDexRules
-    1:1:com.android.tools.r8.R8Command$Builder addMainDexRulesFiles(java.nio.file.Path[]):167:167 -> addMainDexRulesFiles
-    2:2:com.android.tools.r8.R8Command$Builder addMainDexRulesFiles(java.util.Collection):177:177 -> addMainDexRulesFiles
+    2:2:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):366 -> addFeatureSplit
+    3:5:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):366:368 -> addFeatureSplit
+    1:1:com.android.tools.r8.R8Command$Builder addMainDexRules(java.util.List,com.android.tools.r8.origin.Origin):188:188 -> addMainDexRules
+    1:1:com.android.tools.r8.R8Command$Builder addMainDexRulesFiles(java.nio.file.Path[]):168:168 -> addMainDexRulesFiles
+    2:2:com.android.tools.r8.R8Command$Builder addMainDexRulesFiles(java.util.Collection):178:178 -> addMainDexRulesFiles
     1:1:com.android.tools.r8.BaseCommand$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):64:64 -> addProgramResourceProvider
-    2:2:com.android.tools.r8.R8Command$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):352:352 -> addProgramResourceProvider
-    1:1:com.android.tools.r8.R8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):214:214 -> addProguardConfiguration
-    1:1:com.android.tools.r8.R8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):194:194 -> addProguardConfigurationFiles
-    2:2:com.android.tools.r8.R8Command$Builder addProguardConfigurationFiles(java.util.List):204:204 -> addProguardConfigurationFiles
-    1:1:void setDisableVerticalClassMerging(boolean):130:130 -> b
-    2:3:void lambda$addProguardConfigurationFiles$4(java.nio.file.Path[]):195:196 -> b
-    4:5:void lambda$addProguardConfiguration$6(java.util.List,com.android.tools.r8.origin.Origin):214:215 -> b
-    6:6:void lambda$addProguardConfiguration$6(java.util.List,com.android.tools.r8.origin.Origin):214:214 -> b
+    2:2:com.android.tools.r8.R8Command$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):353:353 -> addProgramResourceProvider
+    1:1:com.android.tools.r8.R8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):215:215 -> addProguardConfiguration
+    1:1:com.android.tools.r8.R8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):195:195 -> addProguardConfigurationFiles
+    2:2:com.android.tools.r8.R8Command$Builder addProguardConfigurationFiles(java.util.List):205:205 -> addProguardConfigurationFiles
+    1:1:void setDisableVerticalClassMerging(boolean):131:131 -> b
+    2:3:void lambda$addProguardConfigurationFiles$4(java.nio.file.Path[]):196:197 -> b
+    4:5:void lambda$addProguardConfiguration$6(java.util.List,com.android.tools.r8.origin.Origin):215:216 -> b
+    6:6:void lambda$addProguardConfiguration$6(java.util.List,com.android.tools.r8.origin.Origin):215:215 -> b
     1:1:com.android.tools.r8.BaseCommand makeCommand():64:64 -> c
-    2:5:com.android.tools.r8.R8Command makeCommand():427:430 -> c
-    6:6:com.android.tools.r8.R8Command makeCommand():428:428 -> c
+    2:5:com.android.tools.r8.R8Command makeCommand():428:431 -> c
+    6:6:com.android.tools.r8.R8Command makeCommand():429:429 -> c
     com.android.tools.r8.BaseCommand$Builder self() -> d
-    1:18:void validate():381:398 -> e
-    19:44:void validate():396:421 -> e
-    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():140:140 -> f
-    1:1:void internalForceProguardCompatibility():126:126 -> j
-    1:7:com.android.tools.r8.R8Command makeR8Command():434:440 -> k
+    1:18:void validate():382:399 -> e
+    19:44:void validate():397:422 -> e
+    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():141:141 -> f
+    1:1:void internalForceProguardCompatibility():127:127 -> j
+    1:7:com.android.tools.r8.R8Command makeR8Command():435:441 -> k
     8:8:void com.android.tools.r8.shaking.ProguardConfigurationParser.<init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):110:110 -> k
-    8:8:com.android.tools.r8.R8Command makeR8Command():440 -> k
-    9:113:com.android.tools.r8.R8Command makeR8Command():442:546 -> k
-    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
-    1:1:com.android.tools.r8.R8Command$Builder setKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):297:297 -> setKeptGraphConsumer
-    1:1:com.android.tools.r8.R8Command$Builder setMainDexKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):305:305 -> setMainDexKeptGraphConsumer
+    8:8:com.android.tools.r8.R8Command makeR8Command():441 -> k
+    9:113:com.android.tools.r8.R8Command makeR8Command():443:547 -> k
+    1:1:com.android.tools.r8.R8Command$Builder setDesugaredLibraryKeepRuleConsumer(com.android.tools.r8.StringConsumer):255:255 -> setDesugaredLibraryKeepRuleConsumer
+    1:1:com.android.tools.r8.R8Command$Builder setDisableMinification(boolean):162:162 -> setDisableMinification
+    1:1:com.android.tools.r8.R8Command$Builder setDisableTreeShaking(boolean):151:151 -> setDisableTreeShaking
+    1:1:com.android.tools.r8.R8Command$Builder setKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):298:298 -> setKeptGraphConsumer
+    1:1:com.android.tools.r8.R8Command$Builder setMainDexKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):306:306 -> setMainDexKeptGraphConsumer
     1:1:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):64:64 -> setOutput
     2:2:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):64:64 -> setOutput
-    3:3:com.android.tools.r8.R8Command$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):324:324 -> setOutput
-    4:4:com.android.tools.r8.R8Command$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):347:347 -> setOutput
-    1:1:com.android.tools.r8.R8Command$Builder setProguardConfigurationConsumer(com.android.tools.r8.StringConsumer):289:289 -> setProguardConfigurationConsumer
-    1:1:com.android.tools.r8.R8Command$Builder setProguardMapConsumer(com.android.tools.r8.StringConsumer):243:243 -> setProguardMapConsumer
-    1:2:com.android.tools.r8.R8Command$Builder setProguardMapOutputPath(java.nio.file.Path):229:230 -> setProguardMapOutputPath
-    1:1:com.android.tools.r8.R8Command$Builder setProguardSeedsConsumer(com.android.tools.r8.StringConsumer):278:278 -> setProguardSeedsConsumer
-    1:1:com.android.tools.r8.R8Command$Builder setProguardUsageConsumer(com.android.tools.r8.StringConsumer):266:266 -> setProguardUsageConsumer
+    3:3:com.android.tools.r8.R8Command$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):325:325 -> setOutput
+    4:4:com.android.tools.r8.R8Command$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):348:348 -> setOutput
+    1:1:com.android.tools.r8.R8Command$Builder setProguardConfigurationConsumer(com.android.tools.r8.StringConsumer):290:290 -> setProguardConfigurationConsumer
+    1:1:com.android.tools.r8.R8Command$Builder setProguardMapConsumer(com.android.tools.r8.StringConsumer):244:244 -> setProguardMapConsumer
+    1:2:com.android.tools.r8.R8Command$Builder setProguardMapOutputPath(java.nio.file.Path):230:231 -> setProguardMapOutputPath
+    1:1:com.android.tools.r8.R8Command$Builder setProguardSeedsConsumer(com.android.tools.r8.StringConsumer):279:279 -> setProguardSeedsConsumer
+    1:1:com.android.tools.r8.R8Command$Builder setProguardUsageConsumer(com.android.tools.r8.StringConsumer):267:267 -> setProguardUsageConsumer
 com.android.tools.r8.R8Command$Builder$1 -> com.android.tools.r8.R8Command$Builder$a:
     com.android.tools.r8.shaking.ProguardConfigurationParser val$parser -> a
     com.android.tools.r8.utils.Reporter val$reporter -> b
-    1:1:void <init>(com.android.tools.r8.R8Command$Builder,com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.utils.Reporter):466:466 -> <init>
-    1:4:void visit(com.android.tools.r8.DataEntryResource):474:477 -> visit
+    1:1:void <init>(com.android.tools.r8.R8Command$Builder,com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.utils.Reporter):467:467 -> <init>
+    1:4:void visit(com.android.tools.r8.DataEntryResource):475:478 -> visit
     5:5:void com.android.tools.r8.shaking.ProguardConfigurationSourceBytes.<init>(java.io.InputStream,com.android.tools.r8.origin.Origin):24:24 -> visit
-    5:5:void visit(com.android.tools.r8.DataEntryResource):477 -> visit
-    6:6:void visit(com.android.tools.r8.DataEntryResource):478:478 -> visit
+    5:5:void visit(com.android.tools.r8.DataEntryResource):478 -> visit
+    6:6:void visit(com.android.tools.r8.DataEntryResource):479:479 -> visit
     7:7:void com.android.tools.r8.shaking.ProguardConfigurationParser.parse(com.android.tools.r8.shaking.ProguardConfigurationSource):173:173 -> visit
-    7:7:void visit(com.android.tools.r8.DataEntryResource):478 -> visit
-    8:8:void visit(com.android.tools.r8.DataEntryResource):479:479 -> visit
+    7:7:void visit(com.android.tools.r8.DataEntryResource):479 -> visit
+    8:8:void visit(com.android.tools.r8.DataEntryResource):480:480 -> visit
     9:9:void com.android.tools.r8.shaking.ProguardConfigurationParser.parse(com.android.tools.r8.shaking.ProguardConfigurationSource):173:173 -> visit
-    9:9:void visit(com.android.tools.r8.DataEntryResource):478 -> visit
-    10:18:void visit(com.android.tools.r8.DataEntryResource):475:483 -> visit
-    19:20:void visit(com.android.tools.r8.DataEntryResource):480:481 -> visit
-    21:21:void visit(com.android.tools.r8.DataEntryResource):480:480 -> visit
+    9:9:void visit(com.android.tools.r8.DataEntryResource):479 -> visit
+    10:18:void visit(com.android.tools.r8.DataEntryResource):476:484 -> visit
+    19:20:void visit(com.android.tools.r8.DataEntryResource):481:482 -> visit
+    21:21:void visit(com.android.tools.r8.DataEntryResource):481:481 -> visit
 com.android.tools.r8.R8Command$Builder$DefaultR8DiagnosticsHandler -> com.android.tools.r8.R8Command$Builder$b:
     1:1:void <init>():67:67 -> <init>
     2:2:void <init>(com.android.tools.r8.R8Command$1):67:67 -> <init>
@@ -1329,12 +1334,12 @@
     7:14:void error(com.android.tools.r8.Diagnostic):74:81 -> error
 com.android.tools.r8.R8Command$EnsureNonDexProgramResourceProvider -> com.android.tools.r8.R8Command$b:
     com.android.tools.r8.ProgramResourceProvider provider -> a
-    1:2:void <init>(com.android.tools.r8.ProgramResourceProvider):591:592 -> <init>
-    1:1:com.android.tools.r8.DataResourceProvider getDataResourceProvider():609:609 -> getDataResourceProvider
-    1:4:java.util.Collection getProgramResources():597:600 -> getProgramResources
+    1:2:void <init>(com.android.tools.r8.ProgramResourceProvider):592:593 -> <init>
+    1:1:com.android.tools.r8.DataResourceProvider getDataResourceProvider():610:610 -> getDataResourceProvider
+    1:4:java.util.Collection getProgramResources():598:601 -> getProgramResources
 com.android.tools.r8.R8Command$StandardOutConsumer -> com.android.tools.r8.R8Command$c:
-    1:1:void <init>(com.android.tools.r8.StringConsumer):892:892 -> <init>
-    1:2:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):897:898 -> accept
+    1:1:void <init>(com.android.tools.r8.StringConsumer):893:893 -> <init>
+    1:2:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):898:899 -> accept
 com.android.tools.r8.R8CommandParser -> com.android.tools.r8.s:
     java.util.Set OPTIONS_WITH_PARAMETER -> a
     java.lang.String USAGE_MESSAGE -> b
@@ -1395,12 +1400,12 @@
     1:6:void visit():157:162 -> a
     7:10:void processFieldValue(com.android.tools.r8.graph.DexValue):178:181 -> a
     7:10:void visit():164 -> a
-    11:11:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():439:439 -> a
+    11:11:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():446:446 -> a
     11:11:void processFieldValue(com.android.tools.r8.graph.DexValue):181 -> a
     11:11:void visit():164 -> a
     12:17:void processFieldValue(com.android.tools.r8.graph.DexValue):182:187 -> a
     12:17:void visit():164 -> a
-    18:18:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():439:439 -> a
+    18:18:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():446:446 -> a
     18:18:void processFieldValue(com.android.tools.r8.graph.DexValue):187 -> a
     18:18:void visit():164 -> a
     19:19:void processFieldValue(com.android.tools.r8.graph.DexValue):188:188 -> a
@@ -1575,9 +1580,9 @@
     1:5:void finished(com.android.tools.r8.DiagnosticsHandler):207:211 -> finished
 com.android.tools.r8.StringResource -> com.android.tools.r8.w:
     java.lang.String getString() -> a
-    1:1:com.android.tools.r8.StringResource fromString(java.lang.String,com.android.tools.r8.origin.Origin):26:26 -> a
-    2:2:com.android.tools.r8.StringResource fromFile(java.nio.file.Path):37:37 -> a
-    3:3:com.android.tools.r8.StringResource fromFile(java.nio.file.Path,java.nio.charset.Charset):49:49 -> a
+    1:1:com.android.tools.r8.StringResource fromFile(java.nio.file.Path):37:37 -> a
+    2:2:com.android.tools.r8.StringResource fromFile(java.nio.file.Path,java.nio.charset.Charset):49:49 -> a
+    2:2:com.android.tools.r8.StringResource fromFile(java.nio.file.Path):37 -> a
 com.android.tools.r8.StringResource$1 -> com.android.tools.r8.t:
 com.android.tools.r8.StringResource$FileResource -> com.android.tools.r8.u:
     java.nio.charset.Charset charset -> b
@@ -2007,13 +2012,13 @@
     53:53:com.android.tools.r8.graph.DexType join(java.util.Set):196:196 -> a
     54:64:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo join(com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):205:215 -> a
     65:70:java.util.Map computeVerificationTypes():223:228 -> a
-    71:71:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
+    71:71:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
     71:71:java.util.Map computeVerificationTypes():228 -> a
     72:128:java.util.Map computeVerificationTypes():231:287 -> a
     129:131:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.ir.code.Value):313:315 -> a
     129:131:java.util.Map computeVerificationTypes():288 -> a
     132:151:java.util.Map computeVerificationTypes():290:309 -> a
-    152:152:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
+    152:152:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
     152:152:java.util.Map computeVerificationTypes():228 -> a
     153:158:void addUsers(com.android.tools.r8.ir.code.Value,java.util.Set):319:324 -> a
     1:19:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):155:173 -> b
@@ -2202,7 +2207,7 @@
     3:3:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):45:45 -> a
     4:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):56:57 -> a
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):56:56 -> a
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodHandle():276:276 -> a
+    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodHandle():275:275 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):66 -> a
     boolean canThrow() -> e
     1:1:com.android.tools.r8.graph.DexMethodHandle getHandle():30:30 -> q
@@ -2214,7 +2219,7 @@
     3:3:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):45:45 -> a
     4:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):56:57 -> a
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):56:56 -> a
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodType():280:280 -> a
+    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodType():279:279 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):66 -> a
     boolean canThrow() -> e
     1:1:com.android.tools.r8.graph.DexProto getType():30:30 -> q
@@ -2534,7 +2539,7 @@
     1:5:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):47:51 -> a
     6:7:java.lang.Object decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):60:61 -> a
     6:7:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):51 -> a
-    8:8:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():439:439 -> a
+    8:8:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():446:446 -> a
     8:8:java.lang.Object decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):61 -> a
     8:8:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):51 -> a
     9:23:java.lang.Object decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):61:75 -> a
@@ -2637,7 +2642,7 @@
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):35:35 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):40:40 -> a
     3:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):50:51 -> a
-    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():212:212 -> a
+    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():211:211 -> a
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):60 -> a
     boolean canThrow() -> e
     1:1:com.android.tools.r8.ir.code.Monitor$Type getType():30:30 -> q
@@ -2666,7 +2671,7 @@
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):36:36 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):41:41 -> a
     3:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):79:80 -> a
-    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():272:272 -> a
+    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():271:271 -> a
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):89 -> a
     1:14:int getAsmOpcode():45:58 -> q
 com.android.tools.r8.cf.code.CfNew -> com.android.tools.r8.x.m.L:
@@ -2729,7 +2734,7 @@
     17:17:com.android.tools.r8.cf.code.CfNumberConversion fromAsm(int):116:116 -> a
     18:18:com.android.tools.r8.cf.code.CfNumberConversion fromAsm(int):114:114 -> a
     19:20:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):150:151 -> a
-    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():272:272 -> a
+    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():271:271 -> a
     21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):160 -> a
     1:53:int getAsmOpcode():55:107 -> q
     54:62:int getAsmOpcode():96:104 -> q
@@ -2755,7 +2760,7 @@
     14:14:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):58:58 -> a
     15:15:void print(com.android.tools.r8.cf.CfPrinter):63:63 -> a
     16:17:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):73:74 -> a
-    18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():244:244 -> a
+    18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():243:243 -> a
     18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):83 -> a
     boolean isJump() -> l
     boolean isReturn() -> o
@@ -2765,7 +2770,7 @@
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):28:28 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):33:33 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):43:43 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():244:244 -> a
+    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():243:243 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):52 -> a
     boolean isJump() -> l
     boolean isReturn() -> o
@@ -2933,7 +2938,7 @@
     16:17:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):79:80 -> a
     18:18:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     18:18:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):80 -> a
-    19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStore():260:260 -> a
+    19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStore():259:259 -> a
     19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):94 -> a
     boolean emitsIR() -> f
     boolean isStore() -> p
@@ -12875,7 +12880,7 @@
     135:139:void lambda$readMainDexList$2(com.android.tools.r8.graph.DexApplication$Builder):205:209 -> a
     140:140:void lambda$readMainDexList$2(com.android.tools.r8.graph.DexApplication$Builder):205:205 -> a
     141:141:com.android.tools.r8.graph.DexType lambda$readMainDexList$1(java.lang.String):208:208 -> a
-    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     142:142:com.android.tools.r8.graph.DexType lambda$readMainDexList$1(java.lang.String):208 -> a
     1:1:com.android.tools.r8.utils.AndroidApp access$300(com.android.tools.r8.dex.ApplicationReader):56:56 -> b
 com.android.tools.r8.dex.ApplicationReader$ClassReader -> com.android.tools.r8.A.a:
@@ -12920,134 +12925,149 @@
     com.android.tools.r8.naming.NamingLens namingLens -> d
     java.util.List markerStrings -> g
     com.android.tools.r8.naming.ProguardMapSupplier proguardMapSupplier -> j
-    1:1:void <clinit>():70:70 -> <clinit>
-    1:12:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,java.util.List,com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier,com.android.tools.r8.DexIndexedConsumer):171:182 -> <init>
-    1:1:void encodeChecksums(java.lang.Iterable):212:212 -> a
-    2:2:java.util.HashMap com.android.tools.r8.com.google.common.collect.Maps.newHashMap():283:283 -> a
+    1:1:void <clinit>():71:71 -> <clinit>
+    1:12:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,java.util.List,com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier,com.android.tools.r8.DexIndexedConsumer):172:183 -> <init>
+    1:1:void encodeChecksums(java.lang.Iterable):213:213 -> a
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.dex.ClassesChecksum.getChecksums():40:40 -> a
     2:2:void encodeChecksums(java.lang.Iterable):213 -> a
-    3:6:void encodeChecksums(java.lang.Iterable):214:217 -> a
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    7:7:void encodeChecksums(java.lang.Iterable):218 -> a
-    8:11:void encodeChecksums(java.lang.Iterable):218:221 -> a
-    12:12:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    12:12:void encodeChecksums(java.lang.Iterable):221 -> a
-    13:25:void encodeChecksums(java.lang.Iterable):221:233 -> a
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    26:26:void encodeChecksums(java.lang.Iterable):234 -> a
-    27:31:void encodeChecksums(java.lang.Iterable):234:238 -> a
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    32:32:void encodeChecksums(java.lang.Iterable):239 -> a
-    33:49:void encodeChecksums(java.lang.Iterable):239:255 -> a
-    50:91:void write(java.util.concurrent.ExecutorService):260:301 -> a
-    92:156:void write(java.util.concurrent.ExecutorService):300:364 -> a
-    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():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():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
-    187:192:com.android.tools.r8.dex.FileWriter$ByteBufferResult writeDexFile(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.ByteBufferProvider):620:625 -> a
-    187:192:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):328 -> a
-    193:201:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):329:337 -> a
-    202:212:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):334:344 -> a
-    213:222:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):341:350 -> a
-    223:226:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):377:380 -> a
-    227:233:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):378:384 -> a
-    234:236:boolean validateProguardMapParses(java.lang.String):487:489 -> a
-    234:236:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):384 -> a
-    237:244:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):384:391 -> a
-    245:292:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):390:437 -> a
-    293:293:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):436:436 -> a
-    294:294:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):413:413 -> a
-    295:295:java.lang.String com.android.tools.r8.utils.DescriptorUtils.descriptorToJavaType(java.lang.String):140:140 -> a
-    295:295:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):412 -> a
-    296:300:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):417:421 -> a
-    301:309:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):416:424 -> a
-    310:310:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):415:415 -> a
-    311:311:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):414:414 -> a
-    312:345:void adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):447:480 -> a
-    346:346:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26:26 -> a
-    346:346:void adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):480 -> a
-    347:347:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
-    347:347:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26 -> a
-    347:347:void adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):480 -> a
-    348:348:void adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):480:480 -> a
-    349:362:void insertAttributeAnnotations():497:510 -> a
-    363:363:void insertAttributeAnnotations():509:509 -> a
-    364:372:void insertAttributeAnnotations():508:516 -> a
-    373:373:void insertAttributeAnnotations():515:515 -> a
-    374:390:void insertAttributeAnnotations():514:530 -> a
-    391:397:void insertAttributeAnnotations():529:535 -> a
-    398:407:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createInnerClassAnnotation(com.android.tools.r8.graph.DexString,int,com.android.tools.r8.graph.DexItemFactory):142:151 -> a
-    398:407:void insertAttributeAnnotations():533 -> a
-    408:416:void insertAttributeAnnotations():532:540 -> a
-    417:417:void insertAttributeAnnotations():539:539 -> a
-    418:429:void insertAttributeAnnotations():538:549 -> a
-    430:440:void insertAttributeAnnotations():548:558 -> a
-    441:441:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):72:72 -> a
-    441:441:void insertAttributeAnnotations():556 -> a
-    442:442:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Class,int):49:49 -> a
-    442:442:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):72 -> a
-    442:442:void insertAttributeAnnotations():556 -> a
-    443:444:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):73:74 -> a
-    443:444:void insertAttributeAnnotations():556 -> a
-    445:454:void insertAttributeAnnotations():556:565 -> a
-    455:457:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):581:583 -> a
-    458:458:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMethodBacking():21:21 -> a
-    458:458:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):584 -> a
-    459:460:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):587:588 -> a
-    461:461:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMethodBacking():21:21 -> a
-    461:461:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):589 -> a
-    462:465:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):594:597 -> a
-    466:466:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMapBacking(java.util.Map):25:25 -> a
-    466:466:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):613 -> a
-    467:477:void lambda$rewriteCodeWithJumboStrings$3(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexApplication,java.util.Map,boolean,com.android.tools.r8.graph.DexEncodedMethod):599:609 -> a
-    478:478:java.lang.String mapMainDexListName(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):629:629 -> a
-    478:478:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):638 -> a
-    479:479:java.lang.String com.android.tools.r8.utils.DescriptorUtils.descriptorToJavaType(java.lang.String):140:140 -> a
-    479:479:java.lang.String mapMainDexListName(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):629 -> a
-    479:479:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):638 -> a
-    480:480:java.lang.String mapMainDexListName(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):630:630 -> a
-    480:480:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):638 -> a
-    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():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():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
+    3:3:java.util.HashMap com.android.tools.r8.com.google.common.collect.Maps.newHashMap():283:283 -> a
+    3:3:void encodeChecksums(java.lang.Iterable):214 -> a
+    4:7:void encodeChecksums(java.lang.Iterable):215:218 -> a
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
+    8:8:void encodeChecksums(java.lang.Iterable):219 -> a
+    9:9:void encodeChecksums(java.lang.Iterable):219:219 -> a
+    10:10:java.lang.String com.android.tools.r8.graph.DexProgramClass.toSourceString():214:214 -> a
+    10:10:void encodeChecksums(java.lang.Iterable):222 -> a
+    11:16:void encodeChecksums(java.lang.Iterable):223:228 -> a
+    17:17:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    17:17:void encodeChecksums(java.lang.Iterable):228 -> a
+    18:18:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    18:18:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    18:18:void encodeChecksums(java.lang.Iterable):228 -> a
+    19:19:void encodeChecksums(java.lang.Iterable):228:228 -> a
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
+    20:20:void encodeChecksums(java.lang.Iterable):226 -> a
+    21:21:void encodeChecksums(java.lang.Iterable):226:226 -> a
+    22:41:void encodeChecksums(java.lang.Iterable):225:244 -> a
+    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
+    42:42:void encodeChecksums(java.lang.Iterable):245 -> a
+    43:47:void encodeChecksums(java.lang.Iterable):245:249 -> a
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
+    48:48:void encodeChecksums(java.lang.Iterable):250 -> a
+    49:62:void encodeChecksums(java.lang.Iterable):250:263 -> a
+    63:63:com.android.tools.r8.dex.ClassesChecksum com.android.tools.r8.dex.ClassesChecksum.addChecksum(java.lang.String,java.lang.Long):35:35 -> a
+    63:63:void encodeChecksums(java.lang.Iterable):264 -> a
+    64:64:void encodeChecksums(java.lang.Iterable):266:266 -> a
+    65:106:void write(java.util.concurrent.ExecutorService):271:312 -> a
+    107:171:void write(java.util.concurrent.ExecutorService):311:375 -> a
+    172:180:void write(java.util.concurrent.ExecutorService):369:377 -> a
+    181:181:void lambda$write$0(com.android.tools.r8.dex.ApplicationWriter$SortAnnotations,com.android.tools.r8.graph.DexProgramClass):305:305 -> a
+    182:186:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):316:320 -> a
+    187:187:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():340:340 -> a
+    187:187:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):320 -> a
+    188:195:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):323:330 -> a
+    196:196:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():336:336 -> a
+    196:196:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):330 -> a
+    197:200:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):334:337 -> a
+    201:201:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):336:336 -> a
+    202:207:com.android.tools.r8.dex.FileWriter$ByteBufferResult writeDexFile(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.ByteBufferProvider):631:636 -> a
+    202:207:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):339 -> a
+    208:216:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):340:348 -> a
+    217:227:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):345:355 -> a
+    228:237:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):352:361 -> a
+    238:241:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):388:391 -> a
+    242:248:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):389:395 -> a
+    249:251:boolean validateProguardMapParses(java.lang.String):498:500 -> a
+    249:251:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):395 -> a
+    252:259:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):395:402 -> a
+    260:307:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):401:448 -> a
+    308:308:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):447:447 -> a
+    309:309:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):424:424 -> a
+    310:310:java.lang.String com.android.tools.r8.utils.DescriptorUtils.descriptorToJavaType(java.lang.String):140:140 -> a
+    310:310:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):423 -> a
+    311:315:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):428:432 -> a
+    316:324:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):427:435 -> a
+    325:325:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):426:426 -> a
+    326:326:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):425:425 -> a
+    327:360:void adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):458:491 -> a
+    361:361:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26:26 -> a
+    361:361:void adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):491 -> a
+    362:362:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    362:362:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26 -> a
+    362:362:void adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):491 -> a
+    363:363:void adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):491:491 -> a
+    364:377:void insertAttributeAnnotations():508:521 -> a
+    378:378:void insertAttributeAnnotations():520:520 -> a
+    379:387:void insertAttributeAnnotations():519:527 -> a
+    388:388:void insertAttributeAnnotations():526:526 -> a
+    389:405:void insertAttributeAnnotations():525:541 -> a
+    406:412:void insertAttributeAnnotations():540:546 -> a
+    413:422:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createInnerClassAnnotation(com.android.tools.r8.graph.DexString,int,com.android.tools.r8.graph.DexItemFactory):142:151 -> a
+    413:422:void insertAttributeAnnotations():544 -> a
+    423:431:void insertAttributeAnnotations():543:551 -> a
+    432:432:void insertAttributeAnnotations():550:550 -> a
+    433:444:void insertAttributeAnnotations():549:560 -> a
+    445:455:void insertAttributeAnnotations():559:569 -> a
+    456:456:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):72:72 -> a
+    456:456:void insertAttributeAnnotations():567 -> a
+    457:457:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Class,int):49:49 -> a
+    457:457:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):72 -> a
+    457:457:void insertAttributeAnnotations():567 -> a
+    458:459:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):73:74 -> a
+    458:459:void insertAttributeAnnotations():567 -> a
+    460:469:void insertAttributeAnnotations():567:576 -> a
+    470:472:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):592:594 -> a
+    473:473:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMethodBacking():21:21 -> a
+    473:473:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):595 -> a
+    474:475:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):598:599 -> a
+    476:476:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMethodBacking():21:21 -> a
+    476:476:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):600 -> a
+    477:480:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):605:608 -> a
+    481:481:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMapBacking(java.util.Map):25:25 -> a
+    481:481:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):624 -> a
+    482:492:void lambda$rewriteCodeWithJumboStrings$3(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexApplication,java.util.Map,boolean,com.android.tools.r8.graph.DexEncodedMethod):610:620 -> a
+    493:493:java.lang.String mapMainDexListName(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):640:640 -> a
+    493:493:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):649 -> a
+    494:494:java.lang.String com.android.tools.r8.utils.DescriptorUtils.descriptorToJavaType(java.lang.String):140:140 -> a
+    494:494:java.lang.String mapMainDexListName(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):640 -> a
+    494:494:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):649 -> a
+    495:495:java.lang.String mapMainDexListName(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):641:641 -> a
+    495:495:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):649 -> a
+    496:496:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):649:649 -> a
+    497:502:java.lang.String writeMainDexList(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):645:650 -> a
+    1:1:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):190:190 -> b
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():328:328 -> b
+    2:2:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):190 -> b
+    3:3:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):191:191 -> b
+    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():340:340 -> b
+    4:4:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):192 -> b
+    5:15:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):192:202 -> b
 com.android.tools.r8.dex.ApplicationWriter$1 -> com.android.tools.r8.A.d:
     com.android.tools.r8.dex.ResourceAdapter val$resourceAdapter -> a
     com.android.tools.r8.DataResourceConsumer val$dataResourceConsumer -> b
     java.util.Set val$generatedResourceNames -> d
     com.android.tools.r8.utils.InternalOptions val$options -> c
-    1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,java.util.Set):452:452 -> <init>
-    1:4:void visit(com.android.tools.r8.DataDirectoryResource):455:458 -> visit
-    5:5:void visit(com.android.tools.r8.DataEntryResource):464:464 -> visit
+    1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,java.util.Set):463:463 -> <init>
+    1:4:void visit(com.android.tools.r8.DataDirectoryResource):466:469 -> visit
+    5:5:void visit(com.android.tools.r8.DataEntryResource):475:475 -> visit
     6:6:boolean com.android.tools.r8.dex.ResourceAdapter.isService(com.android.tools.r8.DataEntryResource):97:97 -> visit
-    6:6:void visit(com.android.tools.r8.DataEntryResource):464 -> visit
-    7:12:void visit(com.android.tools.r8.DataEntryResource):469:474 -> visit
-    13:16:void visit(com.android.tools.r8.DataEntryResource):473:476 -> visit
+    6:6:void visit(com.android.tools.r8.DataEntryResource):475 -> visit
+    7:12:void visit(com.android.tools.r8.DataEntryResource):480:485 -> visit
+    13:16:void visit(com.android.tools.r8.DataEntryResource):484:487 -> visit
     17:17:boolean com.android.tools.r8.dex.ResourceAdapter.isService(com.android.tools.r8.DataEntryResource):97:97 -> visit
-    17:17:void visit(com.android.tools.r8.DataEntryResource):464 -> visit
+    17:17:void visit(com.android.tools.r8.DataEntryResource):475 -> visit
 com.android.tools.r8.dex.ApplicationWriter$SortAnnotations -> com.android.tools.r8.A.e:
-    1:1:void <init>():84:84 -> <init>
-    2:2:void <init>(com.android.tools.r8.dex.ApplicationWriter$1):84:84 -> <init>
+    1:1:void <init>():85:85 -> <init>
+    2:2:void <init>(com.android.tools.r8.dex.ApplicationWriter$1):85:85 -> <init>
     boolean add(com.android.tools.r8.graph.DexCode) -> a
     boolean add(com.android.tools.r8.graph.DexDebugInfo) -> a
     boolean add(com.android.tools.r8.graph.DexProgramClass) -> a
     boolean add(com.android.tools.r8.graph.DexTypeList) -> a
     boolean add(com.android.tools.r8.graph.ParameterAnnotationsList) -> a
     boolean setAnnotationsDirectoryForClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationDirectory) -> a
-    1:1:boolean add(com.android.tools.r8.graph.DexAnnotationSet):89:89 -> a
-    2:2:boolean add(com.android.tools.r8.graph.DexAnnotation):96:96 -> a
-    3:4:boolean add(com.android.tools.r8.graph.DexEncodedArray):103:104 -> a
+    1:1:boolean add(com.android.tools.r8.graph.DexAnnotationSet):90:90 -> a
+    2:2:boolean add(com.android.tools.r8.graph.DexAnnotation):97:97 -> a
+    3:4:boolean add(com.android.tools.r8.graph.DexEncodedArray):104:105 -> a
 com.android.tools.r8.dex.BinaryReader -> com.android.tools.r8.A.g:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.dex.CompatByteBuffer buffer -> b
@@ -13070,17 +13090,16 @@
     3:3:void <init>(com.android.tools.r8.com.google.gson.JsonObject):29:29 -> <init>
     4:13:void <init>(com.android.tools.r8.com.google.gson.JsonObject):21:30 -> <init>
     1:1:com.android.tools.r8.dex.ClassesChecksum addChecksum(java.lang.String,java.lang.Long):35:35 -> a
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap getChecksums():40:40 -> a
-    3:4:void lambda$merge$1(java.util.Map$Entry):45:46 -> a
-    5:5:void lambda$merge$1(java.util.Map$Entry):45:45 -> a
-    6:6:com.android.tools.r8.dex.ClassesChecksum merge(com.android.tools.r8.dex.ClassesChecksum):45:45 -> a
-    7:7:void lambda$toString$2(com.android.tools.r8.com.google.gson.JsonObject,java.util.Map$Entry):59:59 -> a
-    8:14:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):66:72 -> a
-    15:15:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonObject():55:55 -> a
-    15:15:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):73 -> a
-    16:16:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):74:74 -> a
-    17:17:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonObject():55:55 -> a
-    17:17:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):73 -> a
+    2:3:void lambda$merge$1(java.util.Map$Entry):45:46 -> a
+    4:4:void lambda$merge$1(java.util.Map$Entry):45:45 -> a
+    5:5:com.android.tools.r8.dex.ClassesChecksum merge(com.android.tools.r8.dex.ClassesChecksum):45:45 -> a
+    6:6:void lambda$toString$2(com.android.tools.r8.com.google.gson.JsonObject,java.util.Map$Entry):59:59 -> a
+    7:13:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):66:72 -> a
+    14:14:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonObject():55:55 -> a
+    14:14:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):73 -> a
+    15:15:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):74:74 -> a
+    16:16:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonObject():55:55 -> a
+    16:16:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):73 -> a
     1:1:void lambda$new$0(java.util.Map$Entry):31:31 -> b
     1:7:java.lang.String toString():54:60 -> toString
 com.android.tools.r8.dex.CodeToKeep -> com.android.tools.r8.A.k:
@@ -13091,7 +13110,7 @@
     void recordField(com.android.tools.r8.graph.DexField) -> a
     void recordMethod(com.android.tools.r8.graph.DexMethod) -> a
     1:2:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):24:25 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     3:3:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):26 -> a
     4:6:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):27:29 -> a
 com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep -> com.android.tools.r8.A.i:
@@ -13431,7 +13450,7 @@
     150:150:void ensureCodesInited(int):159 -> a
     150:150:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):640 -> a
     151:165:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):641:655 -> a
-    166:166:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    166:166:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     166:166:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):655 -> a
     167:170:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):656:659 -> a
     171:171:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
@@ -13525,168 +13544,171 @@
     352:352:boolean com.android.tools.r8.dex.ClassesChecksum.preceedChecksumMarker(com.android.tools.r8.graph.DexString):82:82 -> a
     352:352:void populateChecksums():952 -> a
     352:352:void populateIndexTables():900 -> a
-    353:353:void populateChecksums():957:957 -> a
+    353:353:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.dex.ClassesChecksum.getChecksums():40:40 -> a
+    353:353:void populateChecksums():957 -> a
     353:353:void populateIndexTables():900 -> a
-    354:355:void populateTypes():933:934 -> a
-    354:355:void populateIndexTables():901 -> a
-    356:358:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):967:969 -> a
-    356:358:void populateTypes():934 -> a
-    356:358:void populateIndexTables():901 -> a
-    359:359:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
-    359:359:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):969 -> a
-    359:359:void populateTypes():934 -> a
-    359:359:void populateIndexTables():901 -> a
-    360:364:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):971:975 -> a
-    360:364:void populateTypes():934 -> a
-    360:364:void populateIndexTables():901 -> a
-    365:365:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
-    365:365:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):975 -> a
-    365:365:void populateTypes():934 -> a
-    365:365:void populateIndexTables():901 -> a
-    366:375:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):977:986 -> a
-    366:375:void populateTypes():934 -> a
-    366:375:void populateIndexTables():901 -> a
-    376:376:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):981:981 -> a
-    376:376:void populateTypes():934 -> a
-    376:376:void populateIndexTables():901 -> a
-    377:379:void populateTypes():935:937 -> a
-    377:379:void populateIndexTables():901 -> a
-    380:386:com.android.tools.r8.graph.DexType typeAt(int):1157:1163 -> a
-    380:386:void populateTypes():937 -> a
-    380:386:void populateIndexTables():901 -> a
-    387:387:void populateTypes():937:937 -> a
-    387:387:void populateIndexTables():901 -> a
-    388:389:void populateFields():995:996 -> a
-    388:389:void populateIndexTables():902 -> a
-    390:392:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1011:1013 -> a
-    390:392:void populateFields():996 -> a
-    390:392:void populateIndexTables():902 -> a
-    393:393:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
-    393:393:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1013 -> a
-    393:393:void populateFields():996 -> a
-    393:393:void populateIndexTables():902 -> a
-    394:400:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1015:1021 -> a
-    394:400:void populateFields():996 -> a
-    394:400:void populateIndexTables():902 -> a
-    401:401:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
-    401:401:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1021 -> a
-    401:401:void populateFields():996 -> a
-    401:401:void populateIndexTables():902 -> a
-    402:425:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1023:1046 -> a
-    402:425:void populateFields():996 -> a
-    402:425:void populateIndexTables():902 -> a
-    426:436:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1043:1053 -> a
-    426:436:void populateFields():996 -> a
-    426:436:void populateIndexTables():902 -> a
-    437:441:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1050:1054 -> a
-    437:441:void populateFields():996 -> a
-    437:441:void populateIndexTables():902 -> a
-    442:442:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1039:1039 -> a
-    442:442:void populateFields():996 -> a
-    442:442:void populateIndexTables():902 -> a
-    443:445:void populateFields():997:999 -> a
-    443:445:void populateIndexTables():902 -> a
-    446:451:com.android.tools.r8.graph.DexField fieldAt(int):1167:1172 -> a
-    446:451:void populateFields():999 -> a
-    446:451:void populateIndexTables():902 -> a
-    452:452:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
-    452:452:com.android.tools.r8.graph.DexField fieldAt(int):1172 -> a
-    452:452:void populateFields():999 -> a
-    452:452:void populateIndexTables():902 -> a
-    453:459:com.android.tools.r8.graph.DexField fieldAt(int):1173:1179 -> a
-    453:459:void populateFields():999 -> a
-    453:459:void populateIndexTables():902 -> a
-    460:460:void populateFields():999:999 -> a
-    460:460:void populateIndexTables():902 -> a
-    461:464:void populateProtos():1065:1068 -> a
-    461:464:void populateIndexTables():903 -> a
-    465:470:com.android.tools.r8.graph.DexProto protoAt(int):1240:1245 -> a
-    465:470:void populateProtos():1068 -> a
-    465:470:void populateIndexTables():903 -> a
-    471:471:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
-    471:471:com.android.tools.r8.graph.DexProto protoAt(int):1245 -> a
-    471:471:void populateProtos():1068 -> a
-    471:471:void populateIndexTables():903 -> a
-    472:478:com.android.tools.r8.graph.DexProto protoAt(int):1246:1252 -> a
-    472:478:void populateProtos():1068 -> a
-    472:478:void populateIndexTables():903 -> a
-    479:479:void populateProtos():1068:1068 -> a
-    479:479:void populateIndexTables():903 -> a
-    480:481:void populateMethods():1073:1074 -> a
-    480:481:void populateIndexTables():904 -> a
-    482:484:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1090:1092 -> a
-    482:484:void populateMethods():1074 -> a
-    482:484:void populateIndexTables():904 -> a
-    485:485:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
-    485:485:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1092 -> a
-    485:485:void populateMethods():1074 -> a
-    485:485:void populateIndexTables():904 -> a
-    486:492:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1094:1100 -> a
-    486:492:void populateMethods():1074 -> a
-    486:492:void populateIndexTables():904 -> a
-    493:493:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
-    493:493:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1100 -> a
-    493:493:void populateMethods():1074 -> a
-    493:493:void populateIndexTables():904 -> a
-    494:517:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1102:1125 -> a
-    494:517:void populateMethods():1074 -> a
-    494:517:void populateIndexTables():904 -> a
-    518:528:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1122:1132 -> a
-    518:528:void populateMethods():1074 -> a
-    518:528:void populateIndexTables():904 -> a
-    529:533:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1129:1133 -> a
-    529:533:void populateMethods():1074 -> a
-    529:533:void populateIndexTables():904 -> a
-    534:534:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1118:1118 -> a
-    534:534:void populateMethods():1074 -> a
-    534:534:void populateIndexTables():904 -> a
-    535:537:void populateMethods():1075:1077 -> a
-    535:537:void populateIndexTables():904 -> a
-    538:543:com.android.tools.r8.graph.DexMethod methodAt(int):1256:1261 -> a
-    538:543:void populateMethods():1077 -> a
-    538:543:void populateIndexTables():904 -> a
-    544:544:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
-    544:544:com.android.tools.r8.graph.DexMethod methodAt(int):1261 -> a
-    544:544:void populateMethods():1077 -> a
-    544:544:void populateIndexTables():904 -> a
-    545:551:com.android.tools.r8.graph.DexMethod methodAt(int):1262:1268 -> a
-    545:551:void populateMethods():1077 -> a
-    545:551:void populateIndexTables():904 -> a
-    552:552:com.android.tools.r8.graph.DexMethod methodAt(int):1265:1265 -> a
-    552:552:void populateMethods():1077 -> a
-    552:552:void populateIndexTables():904 -> a
-    553:553:void populateMethods():1077:1077 -> a
+    354:354:void populateChecksums():957:957 -> a
+    354:354:void populateIndexTables():900 -> a
+    355:356:void populateTypes():933:934 -> a
+    355:356:void populateIndexTables():901 -> a
+    357:359:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):967:969 -> a
+    357:359:void populateTypes():934 -> a
+    357:359:void populateIndexTables():901 -> a
+    360:360:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
+    360:360:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):969 -> a
+    360:360:void populateTypes():934 -> a
+    360:360:void populateIndexTables():901 -> a
+    361:365:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):971:975 -> a
+    361:365:void populateTypes():934 -> a
+    361:365:void populateIndexTables():901 -> a
+    366:366:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
+    366:366:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):975 -> a
+    366:366:void populateTypes():934 -> a
+    366:366:void populateIndexTables():901 -> a
+    367:376:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):977:986 -> a
+    367:376:void populateTypes():934 -> a
+    367:376:void populateIndexTables():901 -> a
+    377:377:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):981:981 -> a
+    377:377:void populateTypes():934 -> a
+    377:377:void populateIndexTables():901 -> a
+    378:380:void populateTypes():935:937 -> a
+    378:380:void populateIndexTables():901 -> a
+    381:387:com.android.tools.r8.graph.DexType typeAt(int):1157:1163 -> a
+    381:387:void populateTypes():937 -> a
+    381:387:void populateIndexTables():901 -> a
+    388:388:void populateTypes():937:937 -> a
+    388:388:void populateIndexTables():901 -> a
+    389:390:void populateFields():995:996 -> a
+    389:390:void populateIndexTables():902 -> a
+    391:393:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1011:1013 -> a
+    391:393:void populateFields():996 -> a
+    391:393:void populateIndexTables():902 -> a
+    394:394:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
+    394:394:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1013 -> a
+    394:394:void populateFields():996 -> a
+    394:394:void populateIndexTables():902 -> a
+    395:401:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1015:1021 -> a
+    395:401:void populateFields():996 -> a
+    395:401:void populateIndexTables():902 -> a
+    402:402:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
+    402:402:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1021 -> a
+    402:402:void populateFields():996 -> a
+    402:402:void populateIndexTables():902 -> a
+    403:426:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1023:1046 -> a
+    403:426:void populateFields():996 -> a
+    403:426:void populateIndexTables():902 -> a
+    427:437:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1043:1053 -> a
+    427:437:void populateFields():996 -> a
+    427:437:void populateIndexTables():902 -> a
+    438:442:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1050:1054 -> a
+    438:442:void populateFields():996 -> a
+    438:442:void populateIndexTables():902 -> a
+    443:443:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1039:1039 -> a
+    443:443:void populateFields():996 -> a
+    443:443:void populateIndexTables():902 -> a
+    444:446:void populateFields():997:999 -> a
+    444:446:void populateIndexTables():902 -> a
+    447:452:com.android.tools.r8.graph.DexField fieldAt(int):1167:1172 -> a
+    447:452:void populateFields():999 -> a
+    447:452:void populateIndexTables():902 -> a
+    453:453:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
+    453:453:com.android.tools.r8.graph.DexField fieldAt(int):1172 -> a
+    453:453:void populateFields():999 -> a
+    453:453:void populateIndexTables():902 -> a
+    454:460:com.android.tools.r8.graph.DexField fieldAt(int):1173:1179 -> a
+    454:460:void populateFields():999 -> a
+    454:460:void populateIndexTables():902 -> a
+    461:461:void populateFields():999:999 -> a
+    461:461:void populateIndexTables():902 -> a
+    462:465:void populateProtos():1065:1068 -> a
+    462:465:void populateIndexTables():903 -> a
+    466:471:com.android.tools.r8.graph.DexProto protoAt(int):1240:1245 -> a
+    466:471:void populateProtos():1068 -> a
+    466:471:void populateIndexTables():903 -> a
+    472:472:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
+    472:472:com.android.tools.r8.graph.DexProto protoAt(int):1245 -> a
+    472:472:void populateProtos():1068 -> a
+    472:472:void populateIndexTables():903 -> a
+    473:479:com.android.tools.r8.graph.DexProto protoAt(int):1246:1252 -> a
+    473:479:void populateProtos():1068 -> a
+    473:479:void populateIndexTables():903 -> a
+    480:480:void populateProtos():1068:1068 -> a
+    480:480:void populateIndexTables():903 -> a
+    481:482:void populateMethods():1073:1074 -> a
+    481:482:void populateIndexTables():904 -> a
+    483:485:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1090:1092 -> a
+    483:485:void populateMethods():1074 -> a
+    483:485:void populateIndexTables():904 -> a
+    486:486:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
+    486:486:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1092 -> a
+    486:486:void populateMethods():1074 -> a
+    486:486:void populateIndexTables():904 -> a
+    487:493:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1094:1100 -> a
+    487:493:void populateMethods():1074 -> a
+    487:493:void populateIndexTables():904 -> a
+    494:494:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
+    494:494:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1100 -> a
+    494:494:void populateMethods():1074 -> a
+    494:494:void populateIndexTables():904 -> a
+    495:518:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1102:1125 -> a
+    495:518:void populateMethods():1074 -> a
+    495:518:void populateIndexTables():904 -> a
+    519:529:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1122:1132 -> a
+    519:529:void populateMethods():1074 -> a
+    519:529:void populateIndexTables():904 -> a
+    530:534:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1129:1133 -> a
+    530:534:void populateMethods():1074 -> a
+    530:534:void populateIndexTables():904 -> a
+    535:535:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1118:1118 -> a
+    535:535:void populateMethods():1074 -> a
+    535:535:void populateIndexTables():904 -> a
+    536:538:void populateMethods():1075:1077 -> a
+    536:538:void populateIndexTables():904 -> a
+    539:544:com.android.tools.r8.graph.DexMethod methodAt(int):1256:1261 -> a
+    539:544:void populateMethods():1077 -> a
+    539:544:void populateIndexTables():904 -> a
+    545:545:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
+    545:545:com.android.tools.r8.graph.DexMethod methodAt(int):1261 -> a
+    545:545:void populateMethods():1077 -> a
+    545:545:void populateIndexTables():904 -> a
+    546:552:com.android.tools.r8.graph.DexMethod methodAt(int):1262:1268 -> a
+    546:552:void populateMethods():1077 -> a
+    546:552:void populateIndexTables():904 -> a
+    553:553:com.android.tools.r8.graph.DexMethod methodAt(int):1265:1265 -> a
+    553:553:void populateMethods():1077 -> a
     553:553:void populateIndexTables():904 -> a
-    554:557:void populateMethodHandles():917:920 -> a
-    554:557:void populateIndexTables():905 -> a
-    558:563:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1183:1188 -> a
-    558:563:void populateMethodHandles():920 -> a
-    558:563:void populateIndexTables():905 -> a
-    564:564:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
-    564:564:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1188 -> a
-    564:564:void populateMethodHandles():920 -> a
-    564:564:void populateIndexTables():905 -> a
-    565:586:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1189:1210 -> a
-    565:586:void populateMethodHandles():920 -> a
-    565:586:void populateIndexTables():905 -> a
-    587:587:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1206:1206 -> a
-    587:587:void populateMethodHandles():920 -> a
-    587:587:void populateIndexTables():905 -> a
-    588:604:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1198:1214 -> a
-    588:604:void populateMethodHandles():920 -> a
-    588:604:void populateIndexTables():905 -> a
-    605:605:void populateMethodHandles():920:920 -> a
-    605:605:void populateIndexTables():905 -> a
-    606:609:void populateCallSites():925:928 -> a
-    606:609:void populateIndexTables():906 -> a
-    610:627:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1219:1236 -> a
-    610:627:void populateCallSites():928 -> a
-    610:627:void populateIndexTables():906 -> a
-    628:628:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1231:1231 -> a
-    628:628:void populateCallSites():928 -> a
-    628:628:void populateIndexTables():906 -> a
-    629:629:void populateCallSites():928:928 -> a
+    554:554:void populateMethods():1077:1077 -> a
+    554:554:void populateIndexTables():904 -> a
+    555:558:void populateMethodHandles():917:920 -> a
+    555:558:void populateIndexTables():905 -> a
+    559:564:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1183:1188 -> a
+    559:564:void populateMethodHandles():920 -> a
+    559:564:void populateIndexTables():905 -> a
+    565:565:void com.android.tools.r8.dex.BinaryReader.position(int):86:86 -> a
+    565:565:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1188 -> a
+    565:565:void populateMethodHandles():920 -> a
+    565:565:void populateIndexTables():905 -> a
+    566:587:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1189:1210 -> a
+    566:587:void populateMethodHandles():920 -> a
+    566:587:void populateIndexTables():905 -> a
+    588:588:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1206:1206 -> a
+    588:588:void populateMethodHandles():920 -> a
+    588:588:void populateIndexTables():905 -> a
+    589:605:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1198:1214 -> a
+    589:605:void populateMethodHandles():920 -> a
+    589:605:void populateIndexTables():905 -> a
+    606:606:void populateMethodHandles():920:920 -> a
+    606:606:void populateIndexTables():905 -> a
+    607:610:void populateCallSites():925:928 -> a
+    607:610:void populateIndexTables():906 -> a
+    611:628:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1219:1236 -> a
+    611:628:void populateCallSites():928 -> a
+    611:628:void populateIndexTables():906 -> a
+    629:629:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1231:1231 -> a
+    629:629:void populateCallSites():928 -> a
     629:629:void populateIndexTables():906 -> a
+    630:630:void populateCallSites():928:928 -> a
+    630:630:void populateIndexTables():906 -> a
     1:2:com.android.tools.r8.graph.DexAnnotation parseAnnotation():424:425 -> b
     3:3:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> b
     3:3:com.android.tools.r8.graph.DexAnnotation parseAnnotation():425 -> b
@@ -13980,139 +14002,145 @@
     7:7:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):121:121 -> a
     8:8:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
     8:8:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):121 -> a
-    9:11:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):122:124 -> a
-    12:12:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    12:12:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):124 -> a
-    13:13:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):125:125 -> a
+    9:9:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):122:122 -> a
+    10:10:boolean com.android.tools.r8.graph.PresortedComparable.isSorted(java.lang.Object[],java.util.function.Function):19:19 -> a
+    10:10:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):122 -> a
+    11:13:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):122:124 -> a
     14:14:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    14:14:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):120 -> a
-    15:15:com.android.tools.r8.graph.DexString lambda$writeEncodedAnnotation$0(com.android.tools.r8.graph.DexAnnotationElement):122:122 -> a
-    16:36:com.android.tools.r8.dex.FileWriter collect():131:151 -> a
-    37:74:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):256:293 -> a
-    75:75:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    75:75:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):293 -> a
-    76:76:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):293:293 -> a
-    77:78:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):269:270 -> a
-    79:79:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    79:79:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):270 -> a
-    80:80:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):270:270 -> a
-    81:86:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):324:329 -> a
-    87:90:void addSignaturesFromMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,java.util.Map,com.android.tools.r8.naming.ClassNameMapper):345:348 -> a
-    87:90:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):328 -> a
-    91:91:com.android.tools.r8.naming.MemberNaming$MethodSignature com.android.tools.r8.naming.MemberNaming$MethodSignature.fromDexMethod(com.android.tools.r8.graph.DexMethod):225:225 -> a
-    91:91:void addSignaturesFromMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,java.util.Map,com.android.tools.r8.naming.ClassNameMapper):348 -> a
-    91:91:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):328 -> a
-    92:94:void addSignaturesFromMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,java.util.Map,com.android.tools.r8.naming.ClassNameMapper):349:351 -> a
-    92:94:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):328 -> a
-    95:97:void writeFixedSectionItems(java.util.Collection,int,java.util.function.Consumer):356:358 -> a
-    98:102:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer,int):377:381 -> a
-    103:104:void writeTypeItem(com.android.tools.r8.graph.DexType):430:431 -> a
-    105:107:void writeProtoItem(com.android.tools.r8.graph.DexProto):435:437 -> a
-    108:115:void writeFieldItem(com.android.tools.r8.graph.DexField):441:448 -> a
-    116:123:void writeMethodItem(com.android.tools.r8.graph.DexMethod):452:459 -> a
-    124:125:void writeDebugItem(com.android.tools.r8.graph.DexDebugInfo):477:478 -> a
-    126:140:void writeCodeItem(com.android.tools.r8.graph.DexCode):482:496 -> a
-    141:141:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    141:141:void writeCodeItem(com.android.tools.r8.graph.DexCode):496 -> a
-    142:150:void writeCodeItem(com.android.tools.r8.graph.DexCode):497:505 -> a
-    151:151:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    151:151:void writeCodeItem(com.android.tools.r8.graph.DexCode):505 -> a
-    152:157:void writeCodeItem(com.android.tools.r8.graph.DexCode):506:511 -> a
-    158:158:void com.android.tools.r8.dex.DexOutputBuffer.putSleb128(int):84:84 -> a
-    158:158:void writeCodeItem(com.android.tools.r8.graph.DexCode):511 -> a
-    159:160:void writeCodeItem(com.android.tools.r8.graph.DexCode):512:513 -> a
-    161:161:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    161:161:void writeCodeItem(com.android.tools.r8.graph.DexCode):513 -> a
-    162:162:void writeCodeItem(com.android.tools.r8.graph.DexCode):514:514 -> a
+    14:14:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):124 -> a
+    15:15:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):125:125 -> a
+    16:16:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    16:16:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):120 -> a
+    17:17:com.android.tools.r8.graph.DexString lambda$writeEncodedAnnotation$0(com.android.tools.r8.graph.DexAnnotationElement):122:122 -> a
+    18:38:com.android.tools.r8.dex.FileWriter collect():131:151 -> a
+    39:76:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):256:293 -> a
+    77:77:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    77:77:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):293 -> a
+    78:78:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):293:293 -> a
+    79:80:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):269:270 -> a
+    81:81:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    81:81:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):270 -> a
+    82:82:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):270:270 -> a
+    83:88:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):324:329 -> a
+    89:92:void addSignaturesFromMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,java.util.Map,com.android.tools.r8.naming.ClassNameMapper):345:348 -> a
+    89:92:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):328 -> a
+    93:93:com.android.tools.r8.naming.MemberNaming$MethodSignature com.android.tools.r8.naming.MemberNaming$MethodSignature.fromDexMethod(com.android.tools.r8.graph.DexMethod):225:225 -> a
+    93:93:void addSignaturesFromMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,java.util.Map,com.android.tools.r8.naming.ClassNameMapper):348 -> a
+    93:93:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):328 -> a
+    94:96:void addSignaturesFromMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,java.util.Map,com.android.tools.r8.naming.ClassNameMapper):349:351 -> a
+    94:96:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):328 -> a
+    97:99:void writeFixedSectionItems(java.util.Collection,int,java.util.function.Consumer):356:358 -> a
+    100:104:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer,int):377:381 -> a
+    105:106:void writeTypeItem(com.android.tools.r8.graph.DexType):430:431 -> a
+    107:109:void writeProtoItem(com.android.tools.r8.graph.DexProto):435:437 -> a
+    110:117:void writeFieldItem(com.android.tools.r8.graph.DexField):441:448 -> a
+    118:125:void writeMethodItem(com.android.tools.r8.graph.DexMethod):452:459 -> a
+    126:127:void writeDebugItem(com.android.tools.r8.graph.DexDebugInfo):477:478 -> a
+    128:142:void writeCodeItem(com.android.tools.r8.graph.DexCode):482:496 -> a
+    143:143:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
+    143:143:void writeCodeItem(com.android.tools.r8.graph.DexCode):496 -> a
+    144:152:void writeCodeItem(com.android.tools.r8.graph.DexCode):497:505 -> a
+    153:153:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    153:153:void writeCodeItem(com.android.tools.r8.graph.DexCode):505 -> a
+    154:159:void writeCodeItem(com.android.tools.r8.graph.DexCode):506:511 -> a
+    160:160:void com.android.tools.r8.dex.DexOutputBuffer.putSleb128(int):84:84 -> a
+    160:160:void writeCodeItem(com.android.tools.r8.graph.DexCode):511 -> a
+    161:162:void writeCodeItem(com.android.tools.r8.graph.DexCode):512:513 -> a
     163:163:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    163:163:void writeCodeItem(com.android.tools.r8.graph.DexCode):514 -> a
-    164:164:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    164:164:void writeCodeItem(com.android.tools.r8.graph.DexCode):513 -> a
-    165:165:void writeCodeItem(com.android.tools.r8.graph.DexCode):517:517 -> a
+    163:163:void writeCodeItem(com.android.tools.r8.graph.DexCode):513 -> a
+    164:164:void writeCodeItem(com.android.tools.r8.graph.DexCode):514:514 -> a
+    165:165:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    165:165:void writeCodeItem(com.android.tools.r8.graph.DexCode):514 -> a
     166:166:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    166:166:void writeCodeItem(com.android.tools.r8.graph.DexCode):517 -> a
-    167:167:void com.android.tools.r8.dex.DexOutputBuffer.putSleb128(int):84:84 -> a
-    167:167:void writeCodeItem(com.android.tools.r8.graph.DexCode):511 -> a
-    168:177:void writeCodeItem(com.android.tools.r8.graph.DexCode):520:529 -> a
-    178:178:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    178:178:void writeCodeItem(com.android.tools.r8.graph.DexCode):505 -> a
-    179:184:void writeTypeList(com.android.tools.r8.graph.DexTypeList):534:539 -> a
-    185:186:void writeStringData(com.android.tools.r8.graph.DexString):544:545 -> a
-    187:187:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    187:187:void writeStringData(com.android.tools.r8.graph.DexString):545 -> a
-    188:188:void writeStringData(com.android.tools.r8.graph.DexString):546:546 -> a
+    166:166:void writeCodeItem(com.android.tools.r8.graph.DexCode):513 -> a
+    167:167:void writeCodeItem(com.android.tools.r8.graph.DexCode):517:517 -> a
+    168:168:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    168:168:void writeCodeItem(com.android.tools.r8.graph.DexCode):517 -> a
+    169:169:void com.android.tools.r8.dex.DexOutputBuffer.putSleb128(int):84:84 -> a
+    169:169:void writeCodeItem(com.android.tools.r8.graph.DexCode):511 -> a
+    170:179:void writeCodeItem(com.android.tools.r8.graph.DexCode):520:529 -> a
+    180:180:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    180:180:void writeCodeItem(com.android.tools.r8.graph.DexCode):505 -> a
+    181:186:void writeTypeList(com.android.tools.r8.graph.DexTypeList):534:539 -> a
+    187:188:void writeStringData(com.android.tools.r8.graph.DexString):544:545 -> a
     189:189:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
     189:189:void writeStringData(com.android.tools.r8.graph.DexString):545 -> a
-    190:190:com.android.tools.r8.graph.DexType lambda$writeAnnotationSet$2(com.android.tools.r8.graph.DexAnnotation):559:559 -> a
-    191:191:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):559:559 -> a
-    192:192:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    192:192:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):560 -> a
-    193:196:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):560:563 -> a
-    197:197:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    197:197:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):563 -> a
-    198:200:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):565:567 -> a
-    201:210:void writeAnnotationSetRefList(com.android.tools.r8.graph.ParameterAnnotationsList):572:581 -> a
-    211:213:void writeMemberAnnotations(java.util.List,java.util.function.ToIntFunction):587:589 -> a
-    214:226:void writeAnnotationDirectory(com.android.tools.r8.graph.DexAnnotationDirectory):594:606 -> a
-    227:227:int lambda$writeAnnotationDirectory$3(com.android.tools.r8.graph.DexEncodedField):603:603 -> a
-    228:233:void writeEncodedFields(java.util.List):611:616 -> a
-    234:234:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    234:234:void writeEncodedFields(java.util.List):616 -> a
-    235:235:void writeEncodedFields(java.util.List):618:618 -> a
-    236:236:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    236:236:void writeEncodedFields(java.util.List):618 -> a
-    237:237:void writeEncodedFields(java.util.List):619:619 -> a
+    190:190:void writeStringData(com.android.tools.r8.graph.DexString):546:546 -> a
+    191:191:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    191:191:void writeStringData(com.android.tools.r8.graph.DexString):545 -> a
+    192:192:com.android.tools.r8.graph.DexType lambda$writeAnnotationSet$2(com.android.tools.r8.graph.DexAnnotation):559:559 -> a
+    193:193:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):559:559 -> a
+    194:194:boolean com.android.tools.r8.graph.PresortedComparable.isSorted(java.lang.Object[],java.util.function.Function):19:19 -> a
+    194:194:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):559 -> a
+    195:195:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):559:559 -> a
+    196:196:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
+    196:196:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):560 -> a
+    197:200:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):560:563 -> a
+    201:201:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    201:201:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):563 -> a
+    202:204:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):565:567 -> a
+    205:214:void writeAnnotationSetRefList(com.android.tools.r8.graph.ParameterAnnotationsList):572:581 -> a
+    215:217:void writeMemberAnnotations(java.util.List,java.util.function.ToIntFunction):587:589 -> a
+    218:230:void writeAnnotationDirectory(com.android.tools.r8.graph.DexAnnotationDirectory):594:606 -> a
+    231:231:int lambda$writeAnnotationDirectory$3(com.android.tools.r8.graph.DexEncodedField):603:603 -> a
+    232:237:void writeEncodedFields(java.util.List):611:616 -> a
     238:238:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    238:238:void writeEncodedFields(java.util.List):618 -> a
-    239:239:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    239:239:void writeEncodedFields(java.util.List):616 -> a
-    240:245:void writeEncodedMethods(java.util.List,boolean):624:629 -> a
-    246:246:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    246:246:void writeEncodedMethods(java.util.List,boolean):629 -> a
-    247:247:void writeEncodedMethods(java.util.List,boolean):631:631 -> a
-    248:248:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    248:248:void writeEncodedMethods(java.util.List,boolean):631 -> a
-    249:253:void writeEncodedMethods(java.util.List,boolean):632:636 -> a
-    254:254:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    254:254:void writeEncodedMethods(java.util.List,boolean):636 -> a
-    255:255:void writeEncodedMethods(java.util.List,boolean):638:638 -> a
-    256:256:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    256:256:void writeEncodedMethods(java.util.List,boolean):638 -> a
-    257:257:void writeEncodedMethods(java.util.List,boolean):641:641 -> a
+    238:238:void writeEncodedFields(java.util.List):616 -> a
+    239:239:void writeEncodedFields(java.util.List):618:618 -> a
+    240:240:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    240:240:void writeEncodedFields(java.util.List):618 -> a
+    241:241:void writeEncodedFields(java.util.List):619:619 -> a
+    242:242:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    242:242:void writeEncodedFields(java.util.List):618 -> a
+    243:243:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    243:243:void writeEncodedFields(java.util.List):616 -> a
+    244:249:void writeEncodedMethods(java.util.List,boolean):624:629 -> a
+    250:250:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    250:250:void writeEncodedMethods(java.util.List,boolean):629 -> a
+    251:251:void writeEncodedMethods(java.util.List,boolean):631:631 -> a
+    252:252:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    252:252:void writeEncodedMethods(java.util.List,boolean):631 -> a
+    253:257:void writeEncodedMethods(java.util.List,boolean):632:636 -> a
     258:258:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    258:258:void writeEncodedMethods(java.util.List,boolean):638 -> a
-    259:259:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    259:259:void writeEncodedMethods(java.util.List,boolean):631 -> a
+    258:258:void writeEncodedMethods(java.util.List,boolean):636 -> a
+    259:259:void writeEncodedMethods(java.util.List,boolean):638:638 -> a
     260:260:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    260:260:void writeEncodedMethods(java.util.List,boolean):629 -> a
-    261:267:void addStaticFieldValues(com.android.tools.r8.graph.DexProgramClass):665:671 -> a
-    268:270:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):708:710 -> a
-    271:271:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    271:271:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):710 -> a
-    272:272:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):712:712 -> a
-    273:273:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    273:273:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):712 -> a
-    274:275:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):713:714 -> a
-    276:276:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    276:276:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):712 -> a
-    277:283:int writeMapItem(int,int,int):722:728 -> a
-    284:284:void checkThatInvokeCustomIsAllowed():1370:1370 -> a
-    284:284:void writeCallSite(com.android.tools.r8.graph.DexCallSite):702 -> a
-    285:286:void writeCallSite(com.android.tools.r8.graph.DexCallSite):703:704 -> a
-    287:287:void checkThatInvokeCustomIsAllowed():1371:1371 -> a
-    287:287:void writeCallSite(com.android.tools.r8.graph.DexCallSite):702 -> a
+    260:260:void writeEncodedMethods(java.util.List,boolean):638 -> a
+    261:261:void writeEncodedMethods(java.util.List,boolean):641:641 -> a
+    262:262:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    262:262:void writeEncodedMethods(java.util.List,boolean):638 -> a
+    263:263:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    263:263:void writeEncodedMethods(java.util.List,boolean):631 -> a
+    264:264:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    264:264:void writeEncodedMethods(java.util.List,boolean):629 -> a
+    265:271:void addStaticFieldValues(com.android.tools.r8.graph.DexProgramClass):665:671 -> a
+    272:274:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):708:710 -> 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 writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):710 -> a
+    276:276:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):712:712 -> a
+    277:277:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    277:277:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):712 -> a
+    278:279:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):713:714 -> a
+    280:280:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    280:280:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):712 -> a
+    281:287:int writeMapItem(int,int,int):722:728 -> a
     288:288:void checkThatInvokeCustomIsAllowed():1370:1370 -> a
-    288:288:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):676 -> a
-    289:294:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):678:683 -> a
-    295:303:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):680:688 -> a
-    304:304:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
-    304:304:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):690 -> a
-    305:307:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):691:693 -> a
-    308:308:boolean com.android.tools.r8.graph.DexMethodHandle.isFieldHandle():293:293 -> a
-    308:308:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):693 -> a
-    309:314:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):693:698 -> a
-    315:315:void checkThatInvokeCustomIsAllowed():1371:1371 -> a
-    315:315:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):676 -> a
+    288:288:void writeCallSite(com.android.tools.r8.graph.DexCallSite):702 -> a
+    289:290:void writeCallSite(com.android.tools.r8.graph.DexCallSite):703:704 -> a
+    291:291:void checkThatInvokeCustomIsAllowed():1371:1371 -> a
+    291:291:void writeCallSite(com.android.tools.r8.graph.DexCallSite):702 -> a
+    292:292:void checkThatInvokeCustomIsAllowed():1370:1370 -> a
+    292:292:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):676 -> a
+    293:298:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):678:683 -> a
+    299:307:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):680:688 -> a
+    308:308:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
+    308:308:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):690 -> a
+    309:311:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):691:693 -> a
+    312:312:boolean com.android.tools.r8.graph.DexMethodHandle.isFieldHandle():293:293 -> a
+    312:312:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):693 -> a
+    313:318:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):693:698 -> a
+    319:319:void checkThatInvokeCustomIsAllowed():1371:1371 -> a
+    319:319:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):676 -> a
     1:7:void checkInterfaceMethods():237:243 -> b
     1:7:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():158 -> b
     8:8:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():161:161 -> b
@@ -14212,7 +14240,7 @@
     246:249:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):834:837 -> b
     246:249:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():224 -> b
     250:251:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():227:228 -> b
-    252:252:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> b
+    252:252:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> b
     252:252:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():228 -> b
     253:258:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():228:233 -> b
     259:259:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):828:828 -> b
@@ -15139,7 +15167,10 @@
     19:19:void parseDexFiles():53:53 -> b
     20:20:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
     20:20:void parseDexFiles():53 -> b
-    21:21:void parseDexFiles():53:53 -> b
+    21:21:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> b
+    21:21:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> b
+    21:21:void parseDexFiles():53 -> b
+    22:22:void parseDexFiles():53:53 -> b
 com.android.tools.r8.dex.VDexReader -> com.android.tools.r8.A.X:
     boolean $assertionsDisabled -> e
     int version -> d
@@ -15165,7 +15196,10 @@
     1:13:void setByteOrder():75:87 -> g
     14:14:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> g
     14:14:void setByteOrder():87 -> g
-    15:15:void setByteOrder():87:87 -> g
+    15:15:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> g
+    15:15:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> g
+    15:15:void setByteOrder():87 -> g
+    16:16:void setByteOrder():87:87 -> g
 com.android.tools.r8.dex.VirtualFile -> com.android.tools.r8.A.j0:
     com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection indexedItems -> b
     boolean $assertionsDisabled -> f
@@ -15887,102 +15921,103 @@
     java.util.concurrent.ConcurrentHashMap definitions -> c
     boolean obsolete -> e
     boolean $assertionsDisabled -> f
-    1:1:void <clinit>():21:21 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication):35:35 -> <init>
-    2:14:void <init>(com.android.tools.r8.graph.DexApplication):25:37 -> <init>
-    15:15:void <init>(com.android.tools.r8.graph.AppInfo):40:40 -> <init>
-    16:36:void <init>(com.android.tools.r8.graph.AppInfo):25:45 -> <init>
-    1:1:void copyMetadataFromPrevious(com.android.tools.r8.graph.AppInfo):49:49 -> a
-    2:3:com.android.tools.r8.graph.DexItemFactory dexItemFactory():76:77 -> a
-    4:7:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):81:84 -> a
-    8:8:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getKey():95:95 -> a
-    8:8:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):97 -> a
-    9:9:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):97:97 -> a
-    10:16:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):127:133 -> a
-    17:22:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):149:154 -> a
-    23:24:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):161:162 -> a
-    25:29:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):247:251 -> a
-    30:32:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):277:279 -> a
-    33:36:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,boolean):294:297 -> 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:64:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):512:515 -> a
+    1:1:void <clinit>():22:22 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication):36:36 -> <init>
+    2:14:void <init>(com.android.tools.r8.graph.DexApplication):26:38 -> <init>
+    15:15:void <init>(com.android.tools.r8.graph.AppInfo):41:41 -> <init>
+    16:36:void <init>(com.android.tools.r8.graph.AppInfo):26:46 -> <init>
+    1:1:void copyMetadataFromPrevious(com.android.tools.r8.graph.AppInfo):54:54 -> a
+    2:3:com.android.tools.r8.graph.DexItemFactory dexItemFactory():81:82 -> a
+    4:7:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):86:89 -> a
+    8:8:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getKey():94:94 -> a
+    8:8:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):102 -> a
+    9:9:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):102:102 -> a
+    10:16:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):132:138 -> a
+    17:22:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):154:159 -> a
+    23:24:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):166:167 -> a
+    25:29:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):252:256 -> a
+    30:32:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):282:284 -> a
+    33:36:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,boolean):299:302 -> 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):430:453 -> a
+    61:64:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):517:520 -> a
     65:65:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
-    65:65:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):515 -> a
-    66:66:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):608:608 -> a
+    65:65:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):520 -> a
+    66:66:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):613:613 -> a
     67:67:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> a
-    67:67:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):608 -> a
-    68:69:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):608:609 -> a
+    67:67:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):613 -> a
+    68:69:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):613:614 -> a
     70:70:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
-    70:70:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):609 -> a
-    71:74:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):609:612 -> a
+    70:70:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):614 -> a
+    71:74:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):614:617 -> a
     75:75:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> a
-    75:75:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):612 -> a
-    76:76:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):612:612 -> a
+    75:75:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):617 -> a
+    76:76:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):617:617 -> a
     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():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
-    3:6:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod):234:237 -> b
-    7:13:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):265:271 -> b
-    14:16:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):277:279 -> b
-    14:16:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):273 -> b
-    17:20:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):345:348 -> b
-    21:29:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):404:412 -> b
-    21:29:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):353 -> b
-    30:33:com.android.tools.r8.graph.DexEncodedField lookupStaticTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):525:528 -> b
+    77:77:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):617 -> a
+    78:78:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):645:645 -> a
+    79:79:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> a
+    79:79:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):101 -> a
+    80:80:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):101:101 -> a
+    1:2:com.android.tools.r8.graph.DexApplication app():75:76 -> b
+    3:6:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod):239:242 -> b
+    7:13:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):270:276 -> b
+    14:16:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):282:284 -> b
+    14:16:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):278 -> b
+    17:20:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):350:353 -> b
+    21:29:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):409:417 -> b
+    21:29:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):358 -> b
+    30:33:com.android.tools.r8.graph.DexEncodedField lookupStaticTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):530:533 -> b
     34:34:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> b
-    34:34:com.android.tools.r8.graph.DexEncodedField lookupStaticTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):528 -> b
-    35:36:com.android.tools.r8.graph.DexEncodedField resolveField(com.android.tools.r8.graph.DexField):536:537 -> b
-    37:38:boolean isInMainDexList(com.android.tools.r8.graph.DexType):644:645 -> b
-    1:1:boolean checkIfObsolete():65:65 -> c
-    2:2:boolean isObsolete():53:53 -> c
-    2:2:boolean checkIfObsolete():65 -> c
-    3:3:boolean checkIfObsolete():65:65 -> c
-    4:6:com.android.tools.r8.origin.Origin originFor(com.android.tools.r8.graph.DexType):142:144 -> c
-    7:10:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod):186:189 -> c
-    11:23:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):329:341 -> c
-    24:37:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):484:497 -> c
+    34:34:com.android.tools.r8.graph.DexEncodedField lookupStaticTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):533 -> b
+    35:36:com.android.tools.r8.graph.DexEncodedField resolveField(com.android.tools.r8.graph.DexField):541:542 -> b
+    37:38:boolean isInMainDexList(com.android.tools.r8.graph.DexType):649:650 -> b
+    1:1:boolean checkIfObsolete():70:70 -> c
+    2:2:boolean isObsolete():58:58 -> c
+    2:2:boolean checkIfObsolete():70 -> c
+    3:3:boolean checkIfObsolete():70:70 -> c
+    4:6:com.android.tools.r8.origin.Origin originFor(com.android.tools.r8.graph.DexType):147:149 -> c
+    7:10:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod):191:194 -> c
+    11:23:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):334:346 -> c
+    24:37:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):489:502 -> c
     38:38:boolean com.android.tools.r8.graph.AccessFlags.isPublic():128:128 -> c
-    38:38:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):497 -> c
-    39:39:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):497:497 -> c
+    38:38:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):502 -> c
+    39:39:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):502:502 -> c
     40:40:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> c
-    40:40:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):497 -> c
-    41:49:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):404:412 -> c
-    41:49:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):502 -> c
-    50:69:com.android.tools.r8.graph.DexEncodedField resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):547:566 -> c
-    1:7:java.util.Map computeDefinitions(com.android.tools.r8.graph.DexType):93:99 -> d
-    8:9:java.lang.Iterable classes():103:104 -> d
-    10:12:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):367:369 -> d
-    13:20:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):368:375 -> d
+    40:40:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):502 -> c
+    41:49:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):409:417 -> c
+    41:49:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):507 -> c
+    50:69:com.android.tools.r8.graph.DexEncodedField resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):552:571 -> c
+    1:7:java.util.Map computeDefinitions(com.android.tools.r8.graph.DexType):98:104 -> d
+    8:9:java.lang.Iterable classes():108:109 -> d
+    10:12:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):372:374 -> d
+    13:20:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):373:380 -> d
     21:21:boolean com.android.tools.r8.graph.MethodAccessFlags.isNative():142:142 -> d
-    21:21:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):375 -> d
-    22:22:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):375:375 -> d
+    21:21:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):380 -> d
+    22:22:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):380:380 -> d
     23:23:boolean com.android.tools.r8.graph.MethodAccessFlags.isVarargs():134:134 -> d
-    23:23:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):375 -> d
-    24:32:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):380:388 -> d
-    33:47:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):466:480 -> d
-    1:2:java.lang.Iterable classesWithDeterministicOrder():108:109 -> e
-    3:9:java.util.Map getDefinitions(com.android.tools.r8.graph.DexType):166:172 -> e
-    10:15:com.android.tools.r8.graph.ResolutionResult resolveMethodOnArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):308:313 -> e
-    1:2:java.util.Collection getSynthesizedClassesForSanityCheck():88:89 -> f
-    1:1:boolean hasLiveness():629:629 -> g
-    1:1:boolean hasSubtyping():619:619 -> h
-    1:1:boolean isObsolete():53:53 -> i
-    1:1:void markObsolete():57:57 -> j
-    1:1:void unsetObsolete():61:61 -> k
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():634:634 -> l
-    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():624:624 -> m
+    23:23:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):380 -> d
+    24:32:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):385:393 -> d
+    33:47:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):471:485 -> d
+    1:2:java.lang.Iterable classesWithDeterministicOrder():113:114 -> e
+    3:9:java.util.Map getDefinitions(com.android.tools.r8.graph.DexType):171:177 -> e
+    10:15:com.android.tools.r8.graph.ResolutionResult resolveMethodOnArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):313:318 -> e
+    1:2:java.util.Collection getSynthesizedClassesForSanityCheck():93:94 -> f
+    1:1:boolean hasLiveness():634:634 -> g
+    1:1:boolean hasSubtyping():624:624 -> h
+    1:1:boolean isObsolete():58:58 -> i
+    1:1:void markObsolete():62:62 -> j
+    1:1:com.android.tools.r8.utils.InternalOptions options():50:50 -> k
+    1:1:void unsetObsolete():66:66 -> l
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():639:639 -> m
+    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():629:629 -> n
 com.android.tools.r8.graph.AppInfo$1 -> com.android.tools.r8.C.b:
 com.android.tools.r8.graph.AppInfo$MultiResultBuilder -> com.android.tools.r8.C.c:
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder builder -> a
     com.android.tools.r8.graph.DexEncodedMethod singleResult -> b
-    1:1:void <init>():648:648 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppInfo$1):648:648 -> <init>
-    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
+    1:1:void <init>():653:653 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppInfo$1):653:653 -> <init>
+    1:8:void add(com.android.tools.r8.graph.DexEncodedMethod):659:666 -> a
+    9:12:com.android.tools.r8.graph.ResolutionResult build():671:674 -> a
 com.android.tools.r8.graph.AppInfoWithSubtyping -> com.android.tools.r8.C.f:
     boolean $assertionsDisabled -> m
     java.util.Set missingClasses -> g
@@ -16001,79 +16036,79 @@
     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):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):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):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):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):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
+    91:95:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):325:329 -> a
+    96:96:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
+    96:96:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):330 -> a
+    97:97:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):330:330 -> a
+    98:98:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    98:98:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):330 -> a
+    99:99:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):330:330 -> a
+    100:119:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppInfo.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):208:227 -> a
+    100:119:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):332 -> a
+    120:126:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):354:360 -> a
+    127:127:boolean com.android.tools.r8.graph.DexMethod.hasSameProtoAndName(com.android.tools.r8.graph.DexMethod):103:103 -> a
+    127:127:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):360 -> a
+    128:134:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):360:366 -> a
+    135:145:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):388:398 -> a
+    146:146:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():102:102 -> a
+    146:146:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):398 -> a
+    147:156:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):409:418 -> a
+    157:157:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> a
+    157:157:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):418 -> a
+    158:161:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):419:422 -> a
+    162:162:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):391:391 -> a
+    163:166:boolean isStringConcat(com.android.tools.r8.graph.DexMethodHandle):429:432 -> a
+    167:169:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):437:439 -> a
+    170:185:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):501:516 -> a
+    186:195:boolean isSubtypeOfClass(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,boolean):537:546 -> a
+    196:208:void implementedInterfaces(com.android.tools.r8.graph.DexType,java.util.Set):622:634 -> a
+    209:229:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):723:743 -> a
+    230:230:java.util.Set allImmediateSubtypes(com.android.tools.r8.graph.DexType):455:455 -> a
+    230:230:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):748 -> a
+    231:237:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):748:754 -> a
     1:4:void populateSuperType(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):205:208 -> b
-    5:53:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):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:53:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):660:708 -> b
+    1:1:boolean inDifferentHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):714:714 -> c
+    1:4:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):484:487 -> d
     5:7:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):175:177 -> d
-    5:7:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):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 isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):488 -> d
+    8:16:java.lang.Iterable allImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType):561:569 -> d
+    1:4:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):473:476 -> e
     5:7:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):175:177 -> e
-    5:7:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):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
+    5:7:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):477 -> e
+    8:12:java.lang.Iterable allImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType):585:589 -> e
+    1:1:java.util.Set allImmediateSubtypes(com.android.tools.r8.graph.DexType):455:455 -> f
+    2:11:boolean isInterfaceSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):520:529 -> f
+    1:1:boolean lambda$isStrictSubtypeOf$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):514:514 -> g
+    2:5:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):639:642 -> g
     6:6:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809:809 -> g
-    6:6:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):643 -> g
+    6:6:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):642 -> g
     7:7:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getNext(java.util.Iterator,java.lang.Object):888:888 -> g
     7:7:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809 -> g
-    7:7:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):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
+    7:7:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):642 -> g
+    8:8:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):642:642 -> g
+    1:1:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):336:336 -> h
+    2:2:boolean hasSubtyping():444:444 -> h
+    1:1:boolean hasSubtypes(com.android.tools.r8.graph.DexType):468:468 -> i
+    1:12:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):607:618 -> j
+    13:13:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):617:617 -> j
+    1:1:boolean isMarkedAsInterface(com.android.tools.r8.graph.DexType):463:463 -> k
+    1:1:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):593:593 -> l
     2:6:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithSubtyping):697:701 -> l
-    2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):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: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
+    2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):594 -> l
+    1:1:boolean isSerializable(com.android.tools.r8.graph.DexType):602:602 -> m
+    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():450:450 -> n
+    2:2:boolean isUnknown(com.android.tools.r8.graph.DexType):459:459 -> n
+    3:3:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():102:102 -> n
+    3:3:boolean isUnknown(com.android.tools.r8.graph.DexType):459 -> n
+    1:2:java.util.Set getMissingClasses():191:192 -> o
+    3:3:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):718:718 -> o
+    1:1:java.util.Set access$000():27:27 -> p
+    2:5:java.util.Set subtypes(com.android.tools.r8.graph.DexType):196:199 -> p
     1:1:com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo getTypeInfo(com.android.tools.r8.graph.DexType):214:214 -> q
-    1:1:boolean lambda$allImmediateExtendsSubtypes$2(com.android.tools.r8.graph.DexType):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:boolean lambda$allImmediateExtendsSubtypes$2(com.android.tools.r8.graph.DexType):564:564 -> r
+    1:1:boolean lambda$allImmediateExtendsSubtypes$3(com.android.tools.r8.graph.DexType):567:567 -> s
+    1:1:boolean lambda$allImmediateImplementsSubtypes$4(com.android.tools.r8.graph.DexType):587:587 -> t
     1:1:java.util.Set lambda$populateSuperType$0(com.android.tools.r8.graph.DexType):205:205 -> u
 com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo -> com.android.tools.r8.C.e:
     java.util.Set directSubtypes -> c
@@ -16139,7 +16174,7 @@
     38:47:boolean lambda$readServiceImplementationsForService$2(com.android.tools.r8.origin.Origin,java.util.List,com.android.tools.r8.graph.DexType):193:202 -> a
     1:2:java.lang.String prefixUntilCommentChar(java.lang.String):209:210 -> b
     1:6:void visit(com.android.tools.r8.DataEntryResource):157:162 -> visit
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> visit
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> visit
     7:7:void visit(com.android.tools.r8.DataEntryResource):162 -> visit
     8:13:void visit(com.android.tools.r8.DataEntryResource):163:168 -> visit
     14:19:void visit(com.android.tools.r8.DataEntryResource):167:172 -> visit
@@ -16180,9 +16215,9 @@
     7:7:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
     8:8:com.android.tools.r8.graph.AppInfo appInfo():111:111 -> a
     8:8:com.android.tools.r8.graph.DexDefinition definitionFor(com.android.tools.r8.graph.DexReference):153 -> a
-    9:17:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppInfo.definitionFor(com.android.tools.r8.graph.DexReference):114:122 -> a
+    9:17:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppInfo.definitionFor(com.android.tools.r8.graph.DexReference):119:127 -> a
     9:17:com.android.tools.r8.graph.DexDefinition definitionFor(com.android.tools.r8.graph.DexReference):153 -> a
-    18:18:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppInfo.definitionFor(com.android.tools.r8.graph.DexReference):114:114 -> a
+    18:18:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppInfo.definitionFor(com.android.tools.r8.graph.DexReference):119:119 -> a
     18:18:com.android.tools.r8.graph.DexDefinition definitionFor(com.android.tools.r8.graph.DexReference):153 -> a
     19:19:com.android.tools.r8.graph.AppInfo appInfo():111:111 -> a
     19:19:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):158 -> a
@@ -16322,11 +16357,11 @@
     160:171:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):486:497 -> a
     172:172:boolean com.android.tools.r8.graph.MethodAccessFlags.isSynchronized():110:110 -> a
     172:172:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):497 -> a
-    173:173:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():212:212 -> a
+    173:173:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():211:211 -> a
     173:173:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):498 -> a
     174:183:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):499:508 -> a
     184:192:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):506:514 -> a
-    193:193:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():220:220 -> a
+    193:193:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():219:219 -> a
     193:193:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):517 -> a
     194:194:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):517:517 -> a
     1:1:boolean estimatedSizeForInliningAtMost(int):145:145 -> b
@@ -16547,7 +16582,7 @@
     62:66:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):232 -> a
     67:67:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):231:231 -> a
     68:69:java.lang.String getSignature(com.android.tools.r8.graph.DexAnnotation):236:237 -> a
-    70:70:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():896:896 -> a
+    70:70:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():926:926 -> a
     70:70:java.lang.String getSignature(com.android.tools.r8.graph.DexAnnotation):238 -> a
     71:74:java.lang.String getSignature(com.android.tools.r8.graph.DexAnnotation):238:241 -> a
     75:75:com.android.tools.r8.graph.DexAnnotation createThrowsAnnotation(com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexItemFactory):246:246 -> a
@@ -16557,7 +16592,7 @@
     93:93:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
     93:93:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):351 -> a
     94:103:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):351:360 -> a
-    104:104:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():896:896 -> a
+    104:104:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():926:926 -> a
     104:104:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):361 -> a
     105:110:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):361:366 -> a
     111:112:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):363:364 -> a
@@ -16590,18 +16625,18 @@
     4:4:void com.android.tools.r8.utils.Pair.<init>():20:20 -> c
     4:4:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):159 -> c
     5:8:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):160:163 -> c
-    9:9:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():662:662 -> c
+    9:9:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():683:683 -> c
     9:9:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$DexValueString.getValue():0 -> c
     9:9:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):163 -> c
     10:14:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):163:167 -> c
-    15:15:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():439:439 -> c
+    15:15:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():446:446 -> c
     15:15:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):167 -> c
     16:16:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):167:167 -> c
     1:6:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):185:190 -> d
-    7:7:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():896:896 -> d
+    7:7:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():926:926 -> d
     7:7:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):190 -> d
     8:8:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):190:190 -> d
-    9:9:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():896:896 -> d
+    9:9:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():926:926 -> d
     9:9:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):191 -> d
     10:11:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):191:192 -> d
     1:1:boolean isEnclosingClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):123:123 -> e
@@ -16734,9 +16769,11 @@
     14:14:com.android.tools.r8.graph.DexApplication$Builder addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,boolean):201:201 -> a
     15:15:boolean com.android.tools.r8.graph.DexProgramClass.isProgramClass():0:0 -> a
     15:15:com.android.tools.r8.graph.DexApplication$Builder addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,boolean):201 -> a
-    16:21:com.android.tools.r8.graph.DexApplication$Builder addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,boolean):202:207 -> a
-    22:22:com.android.tools.r8.graph.DexApplication$Builder addToMainDexList(java.util.Collection):223:223 -> a
-    23:26:com.android.tools.r8.graph.DexApplication$Builder mergeChecksums(com.android.tools.r8.dex.ClassesChecksum):228:231 -> a
+    16:17:com.android.tools.r8.graph.DexApplication$Builder addProgramClass(com.android.tools.r8.graph.DexProgramClass):195:196 -> a
+    16:17:com.android.tools.r8.graph.DexApplication$Builder addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,boolean):202 -> a
+    18:22:com.android.tools.r8.graph.DexApplication$Builder addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,boolean):203:207 -> a
+    23:23:com.android.tools.r8.graph.DexApplication$Builder addToMainDexList(java.util.Collection):223:223 -> a
+    24:27:com.android.tools.r8.graph.DexApplication$Builder mergeChecksums(com.android.tools.r8.dex.ClassesChecksum):228:231 -> a
     1:1:java.util.Set getMainDexList():219:219 -> b
     1:1:java.util.Collection getProgramClasses():211:211 -> c
     1:1:java.util.Collection getSynthesizedClasses():215:215 -> d
@@ -17478,60 +17515,61 @@
     com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo optimizationInfo -> e
     com.android.tools.r8.graph.FieldAccessFlags accessFlags -> b
     com.android.tools.r8.graph.DexValue staticValue -> d
-    1:2:void <clinit>():16:17 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):30:30 -> <init>
-    2:12:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):24:34 -> <init>
-    1:3:boolean isProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):38:40 -> a
-    4:4:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):60:60 -> a
-    5:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):66:67 -> a
+    1:2:void <clinit>():15:16 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):29:29 -> <init>
+    2:12:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):23:33 -> <init>
+    1:3:boolean isProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):37:39 -> a
+    4:4:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):59:59 -> a
+    5:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):65:66 -> a
     7:7:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):66:66 -> a
-    7:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):67 -> a
-    8:8:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68:68 -> a
+    7:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):66 -> a
+    8:8:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):67:67 -> a
     9:9:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
-    9:9:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68 -> a
-    10:10:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):69:69 -> a
-    11:11:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):75:75 -> a
-    12:12:void setStaticValue(com.android.tools.r8.graph.DexValue):137:137 -> a
+    9:9:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):67 -> a
+    10:10:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68:68 -> a
+    11:11:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):74:74 -> a
+    12:12:void setStaticValue(com.android.tools.r8.graph.DexValue):136:136 -> a
     13:13:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
-    13:13:void setStaticValue(com.android.tools.r8.graph.DexValue):137 -> a
-    14:16:void setStaticValue(com.android.tools.r8.graph.DexValue):137:139 -> a
-    17:32:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):156:171 -> a
-    33:50:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):170:187 -> a
-    51:51:boolean com.android.tools.r8.graph.AccessFlags.isFinal():175:175 -> a
-    51:51:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):187 -> a
-    52:58:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):187:193 -> a
-    59:59:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):147:147 -> a
-    59:59:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):193 -> a
-    60:60:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):194:194 -> a
-    61:61:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):147:147 -> a
-    61:61:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):193 -> a
-    62:62:boolean lambda$valueAsConstInstruction$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):166:166 -> a
-    63:63:java.lang.Boolean lambda$valueAsConstInstruction$1(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):171:171 -> a
-    64:71:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):202:209 -> a
-    1:1:java.lang.String toSmaliString():85:85 -> f
-    1:1:java.lang.String toSourceString():90:90 -> g
+    13:13:void setStaticValue(com.android.tools.r8.graph.DexValue):136 -> a
+    14:16:void setStaticValue(com.android.tools.r8.graph.DexValue):136:138 -> a
+    17:26:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):153:162 -> a
+    27:27:boolean com.android.tools.r8.graph.AccessFlags.isFinal():175:175 -> a
+    27:27:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):162 -> a
+    28:34:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):162:168 -> a
+    35:35:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):150:150 -> a
+    35:35:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):168 -> a
+    36:36:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):169:169 -> a
+    37:37:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):150:150 -> a
+    37:37:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):168 -> a
+    38:54:boolean mayTriggerClassInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):179:195 -> a
+    55:55:boolean mayTriggerClassInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):194:194 -> a
+    56:56:boolean lambda$mayTriggerClassInitializationSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):190:190 -> a
+    57:57:java.lang.Boolean lambda$mayTriggerClassInitializationSideEffects$1(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):195:195 -> a
+    58:65:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):202:209 -> a
+    1:1:java.lang.String toSmaliString():84:84 -> f
+    1:1:java.lang.String toSourceString():89:89 -> g
     com.android.tools.r8.graph.DexEncodedField asDexEncodedField() -> i
     boolean isDexEncodedField() -> l
-    1:1:boolean isStaticMember():124:124 -> n
-    1:1:com.android.tools.r8.graph.DexReference toReference():100:100 -> o
-    1:1:com.android.tools.r8.graph.DexField getKey():95:95 -> p
-    2:2:com.android.tools.r8.graph.DexField getKey():95:95 -> p
-    2:2:com.android.tools.r8.graph.PresortedComparable getKey():16 -> p
-    1:7:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():50:56 -> q
-    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():46:46 -> r
-    1:1:com.android.tools.r8.graph.DexValue getStaticValue():143:143 -> s
+    1:1:boolean isStaticMember():123:123 -> n
+    1:1:com.android.tools.r8.graph.DexReference toReference():99:99 -> o
+    1:1:com.android.tools.r8.graph.DexField getKey():94:94 -> p
+    2:2:com.android.tools.r8.graph.DexField getKey():94:94 -> p
+    2:2:com.android.tools.r8.graph.PresortedComparable getKey():15 -> p
+    1:7:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():49:55 -> q
+    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():45:45 -> r
+    1:1:com.android.tools.r8.graph.DexValue getStaticValue():142:142 -> s
     2:2:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> s
-    2:2:com.android.tools.r8.graph.DexValue getStaticValue():143 -> s
-    3:4:com.android.tools.r8.graph.DexValue getStaticValue():143:144 -> s
-    1:1:boolean hasAnnotation():128:128 -> t
-    1:1:java.lang.String toString():80:80 -> toString
-    1:1:boolean hasExplicitStaticValue():132:132 -> u
+    2:2:com.android.tools.r8.graph.DexValue getStaticValue():142 -> s
+    3:4:com.android.tools.r8.graph.DexValue getStaticValue():142:143 -> s
+    1:1:boolean hasAnnotation():127:127 -> t
+    1:1:java.lang.String toString():79:79 -> toString
+    1:1:boolean hasExplicitStaticValue():131:131 -> u
     2:2:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> u
-    2:2:boolean hasExplicitStaticValue():132 -> u
-    3:4:boolean hasExplicitStaticValue():132:133 -> u
-    1:1:boolean isStatic():115:115 -> v
+    2:2:boolean hasExplicitStaticValue():131 -> u
+    3:4:boolean hasExplicitStaticValue():131:132 -> u
+    1:1:boolean isStatic():114:114 -> v
     2:2:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> v
-    2:2:boolean isStatic():115 -> v
+    2:2:boolean isStatic():114 -> v
 com.android.tools.r8.graph.DexEncodedMethod -> com.android.tools.r8.C.z0:
     com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo callSiteOptimizationInfo -> h
     boolean obsolete -> m
@@ -17555,11 +17593,11 @@
     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:java.util.Map getParameterInfo():504:504 -> A
+    1:2:boolean hasAnnotation():1080:1081 -> B
+    1:2:boolean hasClassFileVersion():565:566 -> C
+    1:1:boolean hasCode():545:545 -> D
+    1:1:boolean hasParameterInfo():500:500 -> 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():248 -> F
@@ -17618,383 +17656,379 @@
     6:6:boolean isVirtualMethod():286:286 -> V
     7:7:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> V
     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:2:void markNotProcessed():451:452 -> W
+    1:2:java.lang.String qualifiedName():577:578 -> X
+    1:2:void removeCode():554:555 -> 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):1316 -> a
-    7:7:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1317:1317 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1050 -> a
+    6:6:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1317 -> a
+    7:7:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1318:1318 -> a
     8:8:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
-    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
+    8:8:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1318 -> a
+    9:9:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1318:1318 -> a
     10:10:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> a
-    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
+    10:10:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1318 -> a
+    11:11:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1319:1319 -> 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
+    14: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:420 -> 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):405:408 -> 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):398:401 -> 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):391:394 -> a
+    82:114: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):384:416 -> a
+    115:134:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):425:444 -> a
+    135:135:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):441:441 -> a
+    136:136:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):438:438 -> a
+    137:137:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):435:435 -> a
+    138:138:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):432:432 -> a
+    139:157:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):429:447 -> a
+    158:159:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):456:457 -> a
+    160: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):466:467 -> a
+    162:165:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):472:475 -> a
+    166:166:boolean hasParameterInfo():500:500 -> a
+    166:166:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):475 -> a
+    167:168:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):475:476 -> a
+    169:170:void setParameterInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):495:496 -> a
+    169:170:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):476 -> a
+    171:171:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):478:478 -> 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):482:484 -> a
+    175:176:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):516:517 -> a
+    177:177:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
+    177:177:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):517 -> a
+    178:179:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):518:519 -> a
+    180:180:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod):50:50 -> a
+    180:180:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):519 -> a
+    181:181:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):521:521 -> a
+    182:182:void com.android.tools.r8.graph.DexItem.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
+    182:182:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):521 -> a
+    183:183:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):522:522 -> 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
+    184:184:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):522 -> a
+    185:185:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):527:527 -> a
+    186:191:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):532:537 -> a
+    192:200:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):587:595 -> a
+    201:206:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):599:604 -> a
+    207:207:java.lang.String com.android.tools.r8.graph.DexItem.toSmaliString():60:60 -> a
+    207:207:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):604 -> a
+    208:209:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):604:605 -> a
+    210:210:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():99:99 -> a
+    210:210:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():95 -> a
+    210:210:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):605 -> a
+    211:217:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):605:611 -> a
+    218:226:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):332:340 -> a
+    218:226:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    227:227:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    227:227:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):342 -> a
+    227:227:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    228:229:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):342:343 -> a
+    228:229:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    230:230:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    230:230:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):344 -> a
+    230:230:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    231:231:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):344:344 -> a
+    231:231:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> 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
+    232:232:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):345 -> a
+    232:232:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    233:238:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):345:350 -> a
+    233:238:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    239:239:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    239:239:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):351 -> a
+    239:239:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    240:243:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):351:354 -> a
+    240:243:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    244:244:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    244:244:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):355 -> a
+    244:244:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    245:251:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):355:361 -> a
+    245:251:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    252:252:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    252:252:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):362 -> a
+    252:252:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    253:254:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):362:363 -> a
+    253:254:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    255:255:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    255:255:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):364 -> a
+    255:255:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    256:259:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):364:367 -> a
+    256:259:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    260:260:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
+    260:260:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):368 -> a
+    260:260:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    261:282:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):368:389 -> a
+    261:282:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    283:286:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612:615 -> a
+    287:287:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():99:99 -> a
+    287:287:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():95 -> a
+    287:287:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):605 -> a
+    288:288:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):642:642 -> a
+    289:289:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
+    289:289:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):643 -> a
+    290:292:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):644:646 -> a
+    293:293:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
+    293:293:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):646 -> a
+    294:298:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):647:651 -> a
+    299:300:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):706:707 -> a
+    301:302:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):726:727 -> a
+    301:302:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    303:303:com.android.tools.r8.naming.MemberNaming$MethodSignature com.android.tools.r8.naming.MemberNaming$MethodSignature.fromDexMethod(com.android.tools.r8.graph.DexMethod):225:225 -> a
+    303:303:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):727 -> a
+    303:303:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    304:306:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):728:730 -> a
+    304:306:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    307:311:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):729:733 -> a
+    307:311:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    312:312:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    312:312:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):736 -> a
+    312:312:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    313:313:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):736:736 -> a
+    313:313:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    314:314:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):735:735 -> a
+    314:314:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    315:315:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    315:315:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):737 -> a
+    315:315:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    316:319:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):738:741 -> a
+    316:319:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    320:335:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):739:754 -> a
+    320:335:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    336:336:void setObsolete():166:166 -> a
+    336:336:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):755 -> a
+    336:336:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    337:337:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):756:756 -> a
+    337:337:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    338:338:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709:709 -> a
+    339:340:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):760:761 -> a
+    339:340:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    341:341:com.android.tools.r8.naming.MemberNaming$MethodSignature com.android.tools.r8.naming.MemberNaming$MethodSignature.fromDexMethod(com.android.tools.r8.graph.DexMethod):225:225 -> a
+    341:341:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):761 -> a
+    341:341:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    342:344:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):762:764 -> a
+    342:344:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    345:347:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):763:765 -> a
+    345:347:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    348:348:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    348:348:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):766 -> a
+    348:348:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    349:353:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):767:771 -> a
+    349:353:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    354:362:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):768:776 -> a
+    354:362:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    363:363:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):773:773 -> a
+    363:363:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    364:364:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    364:364:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):777 -> a
+    364:364:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    365:368:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):778:781 -> a
+    365:368:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    369:373:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):779:783 -> a
+    369:373:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    374:374:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
+    374:374:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):783 -> a
+    374:374:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    375:376:boolean isStaticMember():334:335 -> a
+    375:376:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):784 -> a
+    375:376:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    377:399:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):788:810 -> a
+    377:399:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    400:400:void setObsolete():166:166 -> a
+    400:400:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):811 -> a
+    400:400:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    401:401:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):812:812 -> a
+    401:401:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    402:406:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):714:718 -> a
+    407:411:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):717:721 -> a
+    412:412:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
+    412:412:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):721 -> a
+    413:413:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):721:721 -> a
+    414:415:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):816:817 -> a
+    416:430:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):821:835 -> a
+    431:431:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):851:851 -> a
+    432:432:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> a
+    432:432:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):851 -> a
+    433:449:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):851:867 -> a
+    450:450:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
+    450:450:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):867 -> a
+    451:453:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):867:869 -> a
+    454:454:void com.android.tools.r8.graph.AccessFlags.unsetPrivate():150:150 -> a
+    454:454:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):869 -> a
+    455:455:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):870:870 -> a
+    456:456:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
+    456:456:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):870 -> a
+    457:457:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):871:871 -> a
+    458:458:void com.android.tools.r8.graph.MethodAccessFlags.setConstructor():174:174 -> a
+    458:458:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):871 -> a
+    459:459:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):872:872 -> a
+    460:465: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):877:882 -> a
+    466:489: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):879:902 -> a
+    490:490: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):887:887 -> a
+    491:494:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):890:893 -> a
+    495:495:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstance():466:466 -> a
+    495:495:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():482 -> a
+    495:495:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):894 -> a
+    496:496:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():482:482 -> a
+    496:496:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):894 -> a
+    497:499:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):895:897 -> a
+    500:500:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():474:474 -> a
+    500:500:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):897 -> a
+    501:502:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):897:898 -> a
+    503:505:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):906:908 -> a
+    506:509: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):917:920 -> a
+    510:510:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
+    510:510: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):920 -> a
+    511: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):921:921 -> a
+    512:512:void com.android.tools.r8.graph.AccessFlags.setStatic():171:171 -> 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):921 -> 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):922:922 -> a
+    514:514:void com.android.tools.r8.graph.AccessFlags.unsetPrivate():150:150 -> 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):922 -> a
+    515:519: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):923:927 -> a
+    520:524: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):924:928 -> a
+    525:530:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):963:968 -> a
+    531:531:void com.android.tools.r8.graph.AccessFlags.demote(int):246:246 -> a
+    531:531:void com.android.tools.r8.graph.AccessFlags.demoteFromFinal():203 -> a
+    531:531:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):968 -> a
+    532:533:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):970:971 -> a
+    534:534:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
+    534:534:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):971 -> a
+    535:538:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):971:974 -> a
+    539:539:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> a
+    539:539:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):974 -> a
+    540:540:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):977:977 -> a
+    541:541:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():154:154 -> a
+    541:541:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):977 -> a
+    542:546:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):980:984 -> a
+    547:547:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
+    547:547:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):984 -> a
+    548:549:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):984:985 -> a
+    550:550:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
+    550:550:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):985 -> a
+    551:565:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):985:999 -> a
+    566:566:void com.android.tools.r8.graph.MethodAccessFlags.setBridge():126:126 -> a
+    566:566:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):999 -> a
+    567:567:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1001:1001 -> a
+    568:568:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
+    568:568:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1001 -> a
+    569:569:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1004:1004 -> a
+    570:581:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1024:1035 -> a
+    582:592:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1034:1044 -> a
+    593:596:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1085:1088 -> a
+    597:597:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    597:597:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1088 -> a
+    598:598:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1090:1090 -> a
+    599:600:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):1166:1167 -> a
+    601:601:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1189:1189 -> a
+    602:603:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1153:1154 -> a
+    602:603:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1191 -> a
+    604:608:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1191:1195 -> a
+    609:609:boolean hasSingleTarget():1341:1341 -> a
+    610:611:void forEachTarget(java.util.function.Consumer):1353:1354 -> 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:com.android.tools.r8.graph.Code getCode():549:550 -> 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):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
+    12:15:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):488:491 -> b
+    16:17:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1153:1154 -> b
+    16:17:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):491 -> b
+    18:18:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):491:491 -> b
+    19:22:void upgradeClassFileVersion(int):570:573 -> b
+    23:23:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):932:932 -> 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):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
+    24:24:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):932 -> b
+    25:32:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):932:939 -> 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):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
+    33:33:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):939 -> b
+    34:36:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):939:941 -> 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):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
+    37:37:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):941 -> b
+    38:50:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):941:953 -> 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):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
+    51:51:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):953 -> b
+    52:52:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):954:954 -> 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):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
+    53:53:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):954 -> b
+    54:54:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):955:955 -> 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):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
+    55:55:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):955 -> b
+    56:59:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):956:959 -> b
+    60:60:void lambda$toForwardingMethod$4(com.android.tools.r8.graph.UseRegistry):993:993 -> b
     61:61:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> b
-    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
+    61:61:void lambda$toForwardingMethod$4(com.android.tools.r8.graph.UseRegistry):993 -> b
+    62:64:void lambda$toForwardingMethod$4(com.android.tools.r8.graph.UseRegistry):994:996 -> b
+    65:65:com.android.tools.r8.graph.DexEncodedMethod asSingleTarget():1335:1335 -> b
+    1:1:boolean shouldNotHaveCode():541:541 -> b0
     2:2:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> b0
-    2:2:boolean shouldNotHaveCode():546 -> b0
-    3:3:boolean shouldNotHaveCode():546:546 -> b0
+    2:2:boolean shouldNotHaveCode():541 -> b0
+    3:3:boolean shouldNotHaveCode():541:541 -> b0
     4:4:boolean com.android.tools.r8.graph.MethodAccessFlags.isNative():142:142 -> b0
-    4:4:boolean shouldNotHaveCode():546 -> b0
+    4:4:boolean shouldNotHaveCode():541 -> 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
+    2:2:void lambda$toInitializerForwardingBridge$0(com.android.tools.r8.graph.UseRegistry):866:866 -> c
+    3:3:com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve():1329:1329 -> c
+    1:4:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():625:628 -> c0
     5:5:boolean com.android.tools.r8.graph.AccessFlags.isFinal():175:175 -> c0
-    5:5:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():633 -> c0
-    6:8:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():633:635 -> c0
+    5:5:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():628 -> c0
+    6:8:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():628:630 -> c0
     9:9:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> c0
-    9:9:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():635 -> c0
-    10:11:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():635:636 -> c0
+    9:9:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():630 -> c0
+    10:11:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():630:631 -> c0
     12:12:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():154:154 -> c0
-    12:12:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():636 -> c0
-    13:13:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():637:637 -> c0
+    12:12:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():631 -> c0
+    13:13:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():632:632 -> 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
+    2:2:void lambda$toStaticForwardingBridge$3(com.android.tools.r8.graph.UseRegistry):947:947 -> d
     3:3:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> d
-    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
+    3:3:void lambda$toStaticForwardingBridge$3(com.android.tools.r8.graph.UseRegistry):947 -> d
+    4:6:void lambda$toStaticForwardingBridge$3(com.android.tools.r8.graph.UseRegistry):948:950 -> d
+    7:7:boolean isValidVirtualTargetForDynamicDispatch():1324:1324 -> d
+    1:7:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():696:702 -> 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
+    2:3:java.util.List asListOfTargets():1347:1348 -> e
+    1:10:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex():672:681 -> 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
+    1:2:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1008:1009 -> f0
     3:3:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> f0
-    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
+    3:3:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1009 -> f0
+    4:11:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1009:1016 -> f0
+    12:12:void setObsolete():166:166 -> f0
+    12:12:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1017 -> f0
+    1:2:java.lang.String toSourceString():620:621 -> g
+    3:3:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1200:1200 -> 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:1:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():1075:1075 -> j
+    1:1:boolean isDexEncodedMethod():1069:1069 -> 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
+    1:2:com.android.tools.r8.graph.DexReference toReference():1063:1064 -> o
+    1:1:com.android.tools.r8.graph.DexMethod getKey():1058:1058 -> p
+    2:2:com.android.tools.r8.graph.DexMethod getKey():1058:1058 -> p
     2:2:com.android.tools.r8.graph.PresortedComparable getKey():80 -> p
-    1:2:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():690:691 -> q
+    1:2:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():685:686 -> q
     3:3:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> q
-    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
+    3:3:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():689 -> q
+    4:6:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():690:692 -> q
+    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():661:662 -> r
+    1:2:java.lang.String codeToString():1050:1051 -> s
+    1:2:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getCallSiteOptimizationInfo():1171:1172 -> t
+    1:2:java.lang.String toString():509:510 -> toString
+    1:3:int getClassFileVersion():559:561 -> u
+    1:2:com.android.tools.r8.graph.Code getCode():549:550 -> 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
+    1:9:com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo getMutableCallSiteOptimizationInfo(com.android.tools.r8.graph.AppView):1177:1185 -> x
+    1:5:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMutableOptimizationInfo():1158:1162 -> y
+    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1153:1154 -> z
 com.android.tools.r8.graph.DexEncodedMethod$1 -> com.android.tools.r8.C.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>():429:429 -> <clinit>
-    2:2:void <clinit>():384:384 -> <clinit>
+    1:1:void <clinit>():427:427 -> <clinit>
+    2:2:void <clinit>():379:379 -> <clinit>
 com.android.tools.r8.graph.DexEncodedMethod$Builder -> com.android.tools.r8.C.t0:
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState compilationState -> f
     com.android.tools.r8.graph.DexAnnotationSet annotations -> c
@@ -18005,31 +18039,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>():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():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():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
+    1:1:void <clinit>():1203:1203 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$1):1203:1203 -> <init>
+    2:18:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1214:1230 -> <init>
+    19:19:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1226:1226 -> <init>
+    1:1:com.android.tools.r8.graph.MethodAccessFlags access$000(com.android.tools.r8.graph.DexEncodedMethod$Builder):1203:1203 -> a
+    2:2:void setMethod(com.android.tools.r8.graph.DexMethod):1235:1235 -> a
+    3:22:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1244:1263 -> a
+    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1239:1239 -> a
+    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1263 -> a
+    24:26:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1266:1268 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1239:1239 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1266 -> a
+    28:30:com.android.tools.r8.graph.DexEncodedMethod$Builder adjustOptimizationInfoAfterRemovingThisParameter():1288:1290 -> a
+    31:31:void setCode(com.android.tools.r8.graph.Code):1296:1296 -> a
+    1:6:com.android.tools.r8.graph.DexEncodedMethod build():1300:1305 -> b
+    7:7:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> b
+    7:7:com.android.tools.r8.graph.DexEncodedMethod build():1305 -> b
+    8:14:com.android.tools.r8.graph.DexEncodedMethod build():1304:1310 -> b
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1273:1273 -> c
+    2:2:void com.android.tools.r8.graph.AccessFlags.promoteToStatic():216:216 -> c
+    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1273 -> c
+    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1278:1282 -> d
 com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility -> com.android.tools.r8.C.u0:
     boolean returnsReceiver -> a
-    1:2:void <init>(boolean):1104:1105 -> <init>
+    1:2:void <init>(boolean):1102:1103 -> <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
@@ -18044,18 +18078,18 @@
     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):1109:1109 -> <init>
-    2:2:void <init>():1111:1111 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):1107:1107 -> <init>
+    2:2:void <init>():1109:1109 -> <init>
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer asTrivialClassInitializer() -> a
     boolean isTrivialInstanceInitializer() -> b
 com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer -> com.android.tools.r8.C.w0:
     com.android.tools.r8.graph.DexField field -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexField):1143:1144 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.DexField):1141:1142 -> <init>
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer asTrivialClassInitializer() -> a
 com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer -> com.android.tools.r8.C.x0:
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer INSTANCE -> a
-    1:1:void <clinit>():1126:1126 -> <clinit>
-    1:1:void <init>():1129:1129 -> <init>
+    1:1:void <clinit>():1124:1124 -> <clinit>
+    1:1:void <init>():1127:1127 -> <init>
     boolean isTrivialInstanceInitializer() -> b
 com.android.tools.r8.graph.DexField -> com.android.tools.r8.C.A0:
     com.android.tools.r8.graph.DexString name -> g
@@ -18124,394 +18158,395 @@
     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 getMethodName -> A0
+    com.android.tools.r8.graph.DexString getDeclaredFieldName -> A0
     com.android.tools.r8.graph.DexString unboxLongMethodName -> Q
-    com.android.tools.r8.graph.DexString strictMathDescriptor -> b1
-    com.android.tools.r8.graph.DexType proxyType -> F2
+    com.android.tools.r8.graph.DexString mathDescriptor -> b1
+    com.android.tools.r8.graph.DexType invocationHandlerType -> F2
     com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd setPrologueEnd -> m
     java.util.concurrent.ConcurrentHashMap classTypeLatticeInterfaces -> q
-    com.android.tools.r8.graph.DexString 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 assertionErrorDescriptor -> I0
+    com.android.tools.r8.graph.DexString proxyDescriptor -> j1
+    com.android.tools.r8.graph.DexString nameMethodName -> r0
     com.android.tools.r8.graph.DexString shortDescriptor -> A
-    com.android.tools.r8.graph.DexType longType -> V1
-    com.android.tools.r8.graph.DexType classType -> w2
+    com.android.tools.r8.graph.DexType intType -> V1
+    com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> w2
     java.util.concurrent.ConcurrentHashMap strings -> a
-    com.android.tools.r8.graph.DexMethod 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 getFieldName -> z0
+    java.util.Set libraryTypesAssumedToBePresent -> g4
+    com.android.tools.r8.graph.DexType lookupType -> O3
+    com.android.tools.r8.graph.DexType classArrayType -> o2
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> c3
     com.android.tools.r8.graph.DexString contentEqualsMethodName -> a0
-    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> G3
+    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> G3
     com.android.tools.r8.graph.DexString unboxFloatMethodName -> R
-    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$StringMethods stringMethods -> f3
-    com.android.tools.r8.graph.DexString autoCloseableDescriptor -> Q0
-    com.android.tools.r8.graph.DexString callableDescriptor -> r1
+    com.android.tools.r8.graph.DexType boxedShortType -> g2
+    com.android.tools.r8.graph.DexString unknownTypeName -> k4
+    com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> I1
+    com.android.tools.r8.graph.DexString valueOfMethodName -> i0
+    com.android.tools.r8.graph.DexString classLoaderDescriptor -> Q0
+    com.android.tools.r8.graph.DexString comparatorDescriptor -> r1
     com.android.tools.r8.graph.DexString voidDescriptor -> B
-    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> W2
-    com.android.tools.r8.graph.DexType annotationEnclosingClass -> 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 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 objectsDescriptor -> Y0
+    com.android.tools.r8.graph.DexString illegalAccessErrorDescriptor -> z1
+    com.android.tools.r8.graph.DexType callableType -> O2
+    com.android.tools.r8.graph.DexMethod stringConcatMethod -> b4
+    com.android.tools.r8.graph.DexString icceDescriptor -> A1
+    com.android.tools.r8.kotlin.Kotlin kotlin -> q3
     com.android.tools.r8.graph.DexString unboxDoubleMethodName -> S
     com.android.tools.r8.graph.DexString booleanDescriptor -> t
-    com.android.tools.r8.graph.DexString 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 invocationHandlerDescriptor -> i1
+    com.android.tools.r8.graph.DexType methodTypeType -> E2
+    com.android.tools.r8.graph.DexString runtimeExceptionDescriptor -> H0
+    com.android.tools.r8.graph.DexString classDescriptor -> P0
+    com.android.tools.r8.graph.DexString collectionDescriptor -> q1
+    com.android.tools.r8.graph.DexString ordinalMethodName -> q0
+    com.android.tools.r8.graph.DexType floatType -> U1
+    com.android.tools.r8.graph.DexType strictMathType -> v2
     com.android.tools.r8.graph.DexString boxedBooleanDescriptor -> C
-    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.DexMethod metafactoryAltMethod -> Y3
+    com.android.tools.r8.graph.DexString getDeclaredConstructorName -> y0
+    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> f4
+    com.android.tools.r8.graph.DexType objectArrayType -> n2
+    com.android.tools.r8.graph.DexType callSiteType -> N3
+    com.android.tools.r8.graph.DexString iterableDescriptor -> a1
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> d3
+    com.android.tools.r8.graph.DexType boxedLongType -> f2
     com.android.tools.r8.graph.DexString isEmptyMethodName -> T
     com.android.tools.r8.graph.DexString byteDescriptor -> u
-    com.android.tools.r8.graph.DexString valueOfMethodName -> h0
-    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 trimName -> h0
+    com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> H1
+    com.android.tools.r8.graph.DexType annotationThrows -> F3
+    com.android.tools.r8.graph.DexString finalizeMethodName -> p0
+    com.android.tools.r8.graph.DexItemFactory$StringMethods stringMethods -> g3
+    com.android.tools.r8.graph.DexString throwableArrayDescriptor -> P1
+    com.android.tools.r8.graph.DexType illegalAccessErrorType -> V2
     com.android.tools.r8.graph.DexString boxedByteDescriptor -> D
-    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
+    com.android.tools.r8.graph.DexString annotationDescriptor -> X0
+    com.android.tools.r8.graph.DexString throwableDescriptor -> 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 getDeclaredMethodName -> C0
+    com.android.tools.r8.graph.DexString stringBuilderDescriptor -> d1
     java.util.Map setInlineFrames -> o
-    com.android.tools.r8.graph.DexType methodTypeType -> D2
+    com.android.tools.r8.graph.DexType methodHandleType -> D2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap defaults -> i
-    com.android.tools.r8.graph.DexString stringDescriptor -> K0
-    com.android.tools.r8.graph.DexString listDescriptor -> l1
-    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> k3
+    com.android.tools.r8.graph.DexString charSequenceArrayDescriptor -> K0
+    com.android.tools.r8.graph.DexString serviceLoaderConfigurationErrorDescriptor -> l1
     com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin setEpilogueBegin -> l
-    com.android.tools.r8.graph.DexString getNameName -> t0
+    com.android.tools.r8.graph.DexString forNameMethodName -> t0
     java.util.concurrent.ConcurrentHashMap methods -> e
-    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.DexType comparableType -> U3
+    com.android.tools.r8.graph.DexType doubleType -> T1
+    com.android.tools.r8.graph.DexType mathType -> 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 objectArrayType -> m2
-    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> n3
-    com.android.tools.r8.graph.DexString noSuchFieldErrorDescriptor -> C1
+    com.android.tools.r8.graph.DexType objectType -> m2
+    com.android.tools.r8.graph.DexString noClassDefFoundErrorDescriptor -> C1
+    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> W3
     com.android.tools.r8.graph.DexString lastIndexOfMethodName -> c0
-    com.android.tools.r8.graph.DexType boxedLongType -> e2
+    com.android.tools.r8.graph.DexType boxedIntType -> e2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap advancePCs -> h
-    com.android.tools.r8.graph.DexType annotationThrows -> E3
-    com.android.tools.r8.graph.DexString classConstructorMethodName -> K1
-    com.android.tools.r8.graph.DexString convertMethodName -> k0
-    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> u3
-    com.android.tools.r8.graph.DexString constructorDescriptor -> S0
-    com.android.tools.r8.graph.DexString consumerDescriptor -> t1
+    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> E3
+    com.android.tools.r8.graph.DexString constructorMethodName -> K1
+    com.android.tools.r8.graph.DexString internMethodName -> k0
+    com.android.tools.r8.graph.DexString classArrayDescriptor -> S0
+    com.android.tools.r8.graph.DexString supplierDescriptor -> t1
     java.util.concurrent.ConcurrentHashMap protos -> d
-    com.android.tools.r8.graph.DexType illegalAccessErrorType -> U2
-    com.android.tools.r8.graph.DexType comparatorType -> M2
+    com.android.tools.r8.graph.DexType throwableType -> U2
+    com.android.tools.r8.graph.DexType mapEntryType -> M2
     com.android.tools.r8.graph.DexString unboxCharMethodName -> N
-    com.android.tools.r8.graph.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.graph.DexString strictMathDescriptor -> c1
+    com.android.tools.r8.graph.DexString getMethodName -> B0
+    com.android.tools.r8.graph.DexType varHandleType -> C2
+    com.android.tools.r8.graph.DexString serviceLoaderDescriptor -> k1
+    com.android.tools.r8.graph.DexString charSequenceDescriptor -> J0
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap restartLocals -> k
-    com.android.tools.r8.graph.DexString forNameMethodName -> s0
-    com.android.tools.r8.graph.DexType doubleType -> S1
-    com.android.tools.r8.graph.DexType mathType -> t2
+    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> l3
+    com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> s0
+    com.android.tools.r8.graph.DexType charType -> S1
+    com.android.tools.r8.graph.DexType iterableType -> t2
     java.util.concurrent.ConcurrentHashMap fields -> c
-    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.DexItemFactory$PolymorphicMethods polymorphicMethods -> r3
+    com.android.tools.r8.graph.DexType externalizableType -> T3
+    java.util.Set libraryClassesWithoutStaticInitialization -> h4
+    com.android.tools.r8.graph.DexType stringArrayType -> l2
     com.android.tools.r8.graph.DexString unboxShortMethodName -> O
-    com.android.tools.r8.graph.DexType metafactoryType -> 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 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.graph.DexString exceptionInInitializerErrorDescriptor -> B1
+    com.android.tools.r8.graph.DexType boxedFloatType -> d2
+    com.android.tools.r8.graph.DexType annotationSignature -> D3
+    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> o3
+    com.android.tools.r8.graph.DexString toStringMethodName -> j0
+    com.android.tools.r8.graph.DexString newUpdaterName -> J1
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap endLocals -> j
-    com.android.tools.r8.graph.DexString classArrayDescriptor -> R0
-    com.android.tools.r8.graph.DexString supplierDescriptor -> s1
-    com.android.tools.r8.graph.DexType throwableType -> T2
+    com.android.tools.r8.graph.DexString autoCloseableDescriptor -> R0
+    com.android.tools.r8.graph.DexString callableDescriptor -> 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 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 collectionsDescriptor -> Z0
+    com.android.tools.r8.graph.DexType mapType -> L2
+    com.android.tools.r8.graph.DexString assertionsDisabled -> E0
+    com.android.tools.r8.graph.DexString varHandleDescriptor -> f1
+    com.android.tools.r8.graph.DexType stringBufferType -> B2
     com.android.tools.r8.graph.DexString equalsMethodName -> Y
     com.android.tools.r8.graph.DexString longDescriptor -> z
-    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 stringArrayDescriptor -> M0
+    com.android.tools.r8.graph.DexString setDescriptor -> n1
+    com.android.tools.r8.graph.DexType boxedBooleanType -> Z1
+    com.android.tools.r8.graph.DexString getCanonicalNameName -> v0
+    com.android.tools.r8.graph.DexType serializableType -> S3
+    com.android.tools.r8.graph.DexType byteType -> R1
+    com.android.tools.r8.graph.DexType collectionsType -> s2
     com.android.tools.r8.graph.DexString boxedLongDescriptor -> I
-    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
+    java.util.Set libraryMethodsReturningReceiver -> c4
+    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> K3
+    com.android.tools.r8.graph.DexType stringType -> k2
+    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> k3
+    com.android.tools.r8.graph.DexString npeDescriptor -> E1
     com.android.tools.r8.utils.LRUCacheTable leastUpperBoundOfInterfacesTable -> r
     com.android.tools.r8.graph.DexString compareToIgnoreCaseMethodName -> e0
-    com.android.tools.r8.graph.DexType annotationSignature -> C3
-    com.android.tools.r8.graph.DexType boxedFloatType -> c2
+    com.android.tools.r8.graph.DexType annotationMethodParameters -> C3
+    com.android.tools.r8.graph.DexType boxedDoubleType -> c2
     com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> Z
-    com.android.tools.r8.graph.DexString 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 thisName -> M1
+    com.android.tools.r8.graph.DexString wrapperFieldName -> m0
+    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> p3
+    com.android.tools.r8.graph.DexString fieldDescriptor -> U0
+    com.android.tools.r8.graph.DexString runnableDescriptor -> v1
+    com.android.tools.r8.graph.DexType 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 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.graph.DexType setType -> K2
+    boolean skipNameValidationForTesting -> i4
+    com.android.tools.r8.graph.DexString stringBufferDescriptor -> e1
+    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> I2
+    com.android.tools.r8.graph.DexString newInstanceName -> D0
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap advanceLines -> g
-    com.android.tools.r8.graph.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.DexType reflectiveOperationExceptionType -> b3
+    com.android.tools.r8.graph.DexString stringDescriptor -> L0
+    com.android.tools.r8.graph.DexString listDescriptor -> m1
+    com.android.tools.r8.graph.DexType stringBuilderType -> A2
+    com.android.tools.r8.graph.DexType voidType -> Y1
+    com.android.tools.r8.graph.DexType autoCloseableType -> z2
+    com.android.tools.r8.graph.DexType stringConcatFactoryType -> Z3
+    com.android.tools.r8.graph.DexString getNameName -> u0
+    com.android.tools.r8.graph.DexType booleanType -> Q1
+    com.android.tools.r8.graph.DexType objectsType -> r2
+    com.android.tools.r8.graph.DexType enumerationType -> R3
     com.android.tools.r8.graph.DexString boxedNumberDescriptor -> K
-    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.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> j3
+    com.android.tools.r8.graph.DexType charSequenceArrayType -> j2
     com.android.tools.r8.graph.DexString compareToMethodName -> d0
-    com.android.tools.r8.graph.DexString npeDescriptor -> D1
-    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> J3
+    com.android.tools.r8.graph.DexString noSuchFieldErrorDescriptor -> D1
+    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> J3
     java.util.Map setFiles -> n
-    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
+    com.android.tools.r8.graph.DexType boxedCharType -> b2
+    com.android.tools.r8.graph.DexString convertMethodName -> l0
+    com.android.tools.r8.graph.DexType annotationMemberClasses -> B3
+    com.android.tools.r8.graph.DexString classConstructorMethodName -> L1
+    com.android.tools.r8.graph.DexType noSuchFieldErrorType -> Z2
     java.util.concurrent.ConcurrentHashMap methodHandles -> f
-    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 constructorDescriptor -> T0
+    com.android.tools.r8.graph.DexString consumerDescriptor -> 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 setType -> J2
-    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> H2
+    com.android.tools.r8.graph.DexType listType -> J2
+    com.android.tools.r8.graph.DexType serviceLoaderType -> H2
     com.android.tools.r8.graph.DexString lengthMethodName -> U
+    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> n3
     com.android.tools.r8.graph.DexString charDescriptor -> v
-    com.android.tools.r8.graph.DexString 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 invokeExactMethodName -> G0
+    com.android.tools.r8.graph.DexString methodTypeDescriptor -> h1
+    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> e3
+    com.android.tools.r8.graph.DexType npeType -> a3
+    com.android.tools.r8.graph.DexString objectArrayDescriptor -> O0
+    com.android.tools.r8.graph.DexString mapEntryDescriptor -> p1
+    com.android.tools.r8.graph.DexType shortType -> X1
+    com.android.tools.r8.graph.DexType classLoaderType -> y2
     com.android.tools.r8.graph.DexString boxedCharDescriptor -> E
-    com.android.tools.r8.graph.DexMethod 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.DexMethod metafactoryMethod -> X3
+    com.android.tools.r8.graph.DexString getTypeNameName -> x0
+    com.android.tools.r8.graph.DexType listIteratorType -> Q3
+    com.android.tools.r8.graph.DexType annotationType -> q2
+    com.android.tools.r8.graph.DexType nullValueType -> j4
+    com.android.tools.r8.graph.DexType charSequenceType -> i2
+    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> I3
+    com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> G1
     com.android.tools.r8.graph.DexString containsMethodName -> V
     com.android.tools.r8.graph.DexString doubleDescriptor -> w
     com.android.tools.r8.graph.DexString substringName -> g0
-    com.android.tools.r8.graph.DexType 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.DexType boxedByteType -> a2
+    com.android.tools.r8.graph.DexType annotationInnerClass -> A3
+    com.android.tools.r8.graph.DexString getClassMethodName -> 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 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 enumDescriptor -> W0
+    com.android.tools.r8.graph.DexString arraysDescriptor -> x1
+    com.android.tools.r8.graph.DexType consumerType -> Q2
+    com.android.tools.r8.graph.DexType proxyType -> G2
+    com.android.tools.r8.graph.DexString methodHandleDescriptor -> g1
+    com.android.tools.r8.graph.DexString invokeMethodName -> F0
     com.android.tools.r8.graph.DexString startsWithMethodName -> W
     com.android.tools.r8.graph.DexString floatDescriptor -> x
-    com.android.tools.r8.graph.DexString objectArrayDescriptor -> N0
-    com.android.tools.r8.graph.DexString mapEntryDescriptor -> o1
+    com.android.tools.r8.graph.DexString objectDescriptor -> N0
+    com.android.tools.r8.graph.DexString mapDescriptor -> o1
     boolean sorted -> s
-    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.DexType longType -> W1
+    com.android.tools.r8.graph.DexType classType -> x2
+    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> V3
     com.android.tools.r8.graph.DexString boxedFloatDescriptor -> G
-    com.android.tools.r8.graph.DexString 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 getSimpleNameName -> w0
+    com.android.tools.r8.graph.DexType charArrayType -> O1
+    com.android.tools.r8.graph.DexType enumType -> p2
+    com.android.tools.r8.graph.DexType iteratorType -> P3
+    java.util.Set libraryMethodsReturningNonNull -> d4
+    com.android.tools.r8.graph.DexType boxedNumberType -> h2
+    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> H3
     com.android.tools.r8.graph.DexString cloneMethodName -> f0
-    com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> F1
+    com.android.tools.r8.graph.DexString reflectiveOperationExceptionDescriptor -> F1
     com.android.tools.r8.graph.DexString endsWithMethodName -> X
     com.android.tools.r8.graph.DexString intDescriptor -> y
-    com.android.tools.r8.graph.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 initMethodName -> n0
+    com.android.tools.r8.graph.DexString charArrayDescriptor -> N1
+    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> s3
+    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> X2
+    com.android.tools.r8.graph.DexType annotationEnclosingClass -> y3
+    com.android.tools.r8.graph.DexString methodDescriptor -> V0
+    com.android.tools.r8.graph.DexString optionalDescriptor -> w1
     com.android.tools.r8.graph.DexString boxedIntDescriptor -> H
-    com.android.tools.r8.graph.DexType consumerType -> 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: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>
+    2:364:void <init>():65:427 -> <init>
+    365:413:void <init>():417:465 -> <init>
+    414:430:void <init>():455:471 -> <init>
+    431:449:void <init>():468:486 -> <init>
+    450:470:void <init>():477:497 -> <init>
+    471:503:void <init>():490:522 -> <init>
+    504:508:void <init>():521:525 -> <init>
+    509:512:void <init>():524:527 -> <init>
+    513:550:void <init>():518:555 -> <init>
+    551:553:void <init>():106:108 -> <init>
+    554:554:void <init>():107:107 -> <init>
     com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame lambda$createSetInlineFrame$4(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame) -> a
     1:1:com.android.tools.r8.graph.DexType access$1900(com.android.tools.r8.graph.DexItemFactory):61:61 -> a
     2:2:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> a
-    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):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
+    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):430:431 -> a
+    5:7:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):443:445 -> a
+    8:8:com.android.tools.r8.utils.Pair lambda$mapToPredicate$1(java.util.function.Predicate,com.android.tools.r8.graph.DexMethod):532:532 -> a
+    9:9:java.util.stream.Stream mapToPredicate(java.util.Set,java.util.function.Predicate):532:532 -> a
+    10:11:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1156:1157 -> a
     12:12:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> a
-    12:12:com.android.tools.r8.graph.DexItem canonicalize(java.util.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
+    12:12:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1157 -> a
+    13:14:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1157:1158 -> a
+    15:16:com.android.tools.r8.graph.DexString createString(int,byte[]):1163:1164 -> a
+    17:18:com.android.tools.r8.graph.DexString createString(java.lang.String):1168:1169 -> a
+    19:19:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$3(com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.dex.ClassesChecksum):1205:1205 -> a
+    20:21:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1231:1232 -> a
     22:22:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    22:22:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):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
+    22:22:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1232 -> a
+    23:23:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1232:1232 -> a
+    24:24:com.android.tools.r8.graph.DexType createType(java.lang.String):1223:1223 -> a
+    24:24:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1232 -> a
+    25:27:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):1236:1238 -> a
+    28:28:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1242:1242 -> a
+    29:31:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString):1246:1248 -> a
+    32:35:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1252:1255 -> a
+    36:41:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1321:1326 -> a
+    36:41:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1256 -> a
+    42:42:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1253:1253 -> a
+    43:43:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):1260:1260 -> a
+    44:44:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1270:1270 -> a
     45:45:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    45:45:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):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
+    45:45:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1270 -> a
+    46:47:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1270:1271 -> a
     48:48:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    48:48:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):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
+    48:48:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1273 -> a
+    49:51:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1272:1274 -> a
+    52:56:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1287:1291 -> a
+    57:64:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1308:1315 -> a
+    57:64:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1291 -> a
     65:74:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.copyWithSparseChanges(java.lang.Class,java.lang.Object[],java.util.Map):25:34 -> a
-    65:74:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):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
+    65:74:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1317 -> a
+    65:74:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1291 -> a
+    75:75:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1317:1317 -> a
+    75:75:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1291 -> a
+    76:82:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1292:1298 -> a
+    83:87:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1297:1301 -> a
+    88:90:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):1330:1332 -> a
+    91:91:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> a
+    92:94:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):1343:1345 -> a
+    95:96:com.android.tools.r8.graph.DexCallSite createCallSite(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):1354:1355 -> a
+    97:106:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString[]):1363:1372 -> a
+    107:109:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):1376:1378 -> a
+    110:112:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):1414:1416 -> a
+    113:115:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):1421:1423 -> a
+    116:116:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):1431:1431 -> a
+    117:119:void clearTypeLatticeElementsCache():1435:1437 -> a
+    120:127:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1464:1471 -> a
+    128:156:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1470:1498 -> a
+    157:165:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1478:1486 -> a
+    166:177:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1485:1496 -> a
+    178:179:java.util.Set getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1503:1504 -> a
+    180:181:java.util.Set lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1507:1508 -> a
+    182:186:void assignSortedIndices(java.util.Collection,com.android.tools.r8.naming.NamingLens):1515:1519 -> a
+    187:187:int lambda$assignSortedIndices$7(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):1516:1516 -> a
+    188:194:void sort(com.android.tools.r8.naming.NamingLens):1524:1530 -> a
+    195:195:void forAllTypes(java.util.function.Consumer):1547:1547 -> a
+    1:7:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1209:1215 -> b
+    8:10:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1214:1216 -> b
     11:11:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> b
-    11:11:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):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
+    11:11:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1216 -> b
+    12:13:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1216:1217 -> b
+    14:14:com.android.tools.r8.graph.DexType createType(java.lang.String):1223:1223 -> b
+    15:17:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):1382:1384 -> b
+    18:18:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():1406:1406 -> b
+    19:19:boolean isConstructor(com.android.tools.r8.graph.DexMethod):1427:1427 -> b
+    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):566:566 -> c
+    2:2:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1173:1173 -> c
+    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):1227:1227 -> c
+    4:6:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):1388:1390 -> c
+    7:7:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():1410:1410 -> c
+    1:2:com.android.tools.r8.dex.ClassesChecksum extractChecksum():1204:1205 -> d
+    3:3:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$2(com.android.tools.r8.graph.DexString):1204:1204 -> d
+    4:6:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):1394:1396 -> d
+    1:5:java.util.Collection extractMarker():1179:1183 -> e
+    6:8:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):1400:1402 -> e
+    1:5:java.util.List extractMarkers():1193:1197 -> f
+    1:1:boolean getSkipNameValidationForTesting():562:562 -> g
+    1:10:void resetSortedIndices():1534:1543 -> h
+    1:3:boolean verifyNoCachedTypeLatticeElements():1441:1443 -> i
+    1:12:java.util.Set boxedValueOfMethods():440:451 -> j
 com.android.tools.r8.graph.DexItemFactory$1 -> com.android.tools.r8.C.C0:
 com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods -> com.android.tools.r8.C.D0:
     com.android.tools.r8.graph.DexMethod initMessageAndCause -> b
     com.android.tools.r8.graph.DexMethod initMessage -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):615:615 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):619:624 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):616:616 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):620:625 -> <init>
 com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods -> com.android.tools.r8.C.E0:
     java.util.Set updaters -> d
     com.android.tools.r8.graph.DexMethod referenceUpdater -> c
     com.android.tools.r8.graph.DexMethod longUpdater -> b
     com.android.tools.r8.graph.DexMethod intUpdater -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):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
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):830:830 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):836:855 -> <init>
+    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):859:859 -> a
 com.android.tools.r8.graph.DexItemFactory$ClassMethods -> com.android.tools.r8.C.F0:
     com.android.tools.r8.graph.DexMethod newInstance -> l
     com.android.tools.r8.graph.DexMethod getDeclaredMethod -> k
@@ -18527,47 +18562,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):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
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):659:659 -> <init>
+    2:31:void <init>(com.android.tools.r8.graph.DexItemFactory):676:705 -> <init>
+    1:1:java.util.Set access$1700(com.android.tools.r8.graph.DexItemFactory$ClassMethods):659:659 -> a
+    2:2:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):709:709 -> a
+    1:1:boolean isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):713:713 -> b
 com.android.tools.r8.graph.DexItemFactory$ConstructorMethods -> com.android.tools.r8.C.G0:
     com.android.tools.r8.graph.DexMethod newInstance -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):716:716 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):720:722 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):717:717 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):721:723 -> <init>
 com.android.tools.r8.graph.DexItemFactory$EnumMethods -> com.android.tools.r8.C.H0:
     com.android.tools.r8.graph.DexMethod toString -> d
     com.android.tools.r8.graph.DexMethod name -> c
     com.android.tools.r8.graph.DexMethod ordinal -> b
     com.android.tools.r8.graph.DexMethod valueOf -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):730:730 -> <init>
-    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):737:757 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):731:731 -> <init>
+    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):738:758 -> <init>
 com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods -> com.android.tools.r8.C.I0:
     com.android.tools.r8.graph.DexMethod asList -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):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>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):579:579 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):583:587 -> <init>
+    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):585:585 -> <init>
 com.android.tools.r8.graph.DexItemFactory$LongMethods -> com.android.tools.r8.C.J0:
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):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>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):569:569 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):573:575 -> <init>
+    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):574:574 -> <init>
 com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.C.K0:
     com.android.tools.r8.graph.DexMethod init -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):765:765 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):769:771 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):766:766 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):770:772 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ObjectMethods -> com.android.tools.r8.C.L0:
     com.android.tools.r8.graph.DexMethod toString -> d
     com.android.tools.r8.graph.DexMethod finalize -> c
     com.android.tools.r8.graph.DexMethod constructor -> b
     com.android.tools.r8.graph.DexMethod getClass -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):629:629 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.DexItemFactory):636:643 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):630:630 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.DexItemFactory):637:644 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> com.android.tools.r8.C.M0:
     com.android.tools.r8.graph.DexMethod requireNonNull -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):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>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):649:649 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):653:655 -> <init>
+    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):654:654 -> <init>
 com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.C.N0:
     com.android.tools.r8.graph.DexProto compareAndSetSignature -> c
     java.util.Set varHandleMethods -> d
@@ -18576,9 +18611,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):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
+    1:36:void <init>(com.android.tools.r8.graph.DexItemFactory):1044:1079 -> <init>
+    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):1087:1097 -> a
+    12:17:java.util.Set createStrings(java.lang.String[]):1104:1109 -> a
 com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> com.android.tools.r8.C.O0:
     com.android.tools.r8.graph.DexField longTYPE -> f
     com.android.tools.r8.graph.DexField intTYPE -> e
@@ -18589,24 +18624,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):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
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):786:786 -> <init>
+    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):798:818 -> <init>
+    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):822:822 -> a
 com.android.tools.r8.graph.DexItemFactory$ProxyMethods -> com.android.tools.r8.C.P0:
     com.android.tools.r8.graph.DexMethod newProxyInstance -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):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>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1113:1113 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1117:1122 -> <init>
+    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1119:1119 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> com.android.tools.r8.C.Q0:
     com.android.tools.r8.graph.DexMethod iterator -> d
     com.android.tools.r8.graph.DexMethod loadInstalled -> c
     com.android.tools.r8.graph.DexMethod loadWithClassLoader -> b
     com.android.tools.r8.graph.DexMethod load -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):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
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1126:1126 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1133:1139 -> <init>
+    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1137:1145 -> <init>
+    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1142:1147 -> <init>
+    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):1151:1151 -> a
 com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> com.android.tools.r8.C.R0:
     com.android.tools.r8.graph.DexMethod defaultConstructor -> o
     com.android.tools.r8.graph.DexMethod charSequenceConstructor -> n
@@ -18629,19 +18664,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>():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
+    1:1:void <clinit>():936:936 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):936:936 -> <init>
+    2:46:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):960:1004 -> <init>
+    1:1:java.util.Set access$1600(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):936:936 -> a
+    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):1009:1009 -> a
+    3:7:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1013:1017 -> a
     8:8:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    8:8:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1014 -> a
-    9:25:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1017:1033 -> a
+    8:8:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1017 -> a
+    9:25:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1020:1036 -> a
     26:26:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    26:26:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):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
+    26:26:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1036 -> a
+    27:27:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1039:1039 -> a
+    1:1:java.util.Set access$1800(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):936:936 -> b
 com.android.tools.r8.graph.DexItemFactory$StringMethods -> com.android.tools.r8.C.S0:
     com.android.tools.r8.graph.DexMethod hashCode -> o
     com.android.tools.r8.graph.DexMethod compareToIgnoreCase -> n
@@ -18658,21 +18693,24 @@
     com.android.tools.r8.graph.DexMethod contains -> c
     com.android.tools.r8.graph.DexMethod length -> b
     com.android.tools.r8.graph.DexMethod isEmpty -> a
+    com.android.tools.r8.graph.DexItemFactory this$0 -> t
+    com.android.tools.r8.graph.DexMethod trim -> s
     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):862:862 -> <init>
-    2:45:void <init>(com.android.tools.r8.graph.DexItemFactory):885:928 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):863:863 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):888:888 -> <init>
+    3:48:void <init>(com.android.tools.r8.graph.DexItemFactory):886:931 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> com.android.tools.r8.C.T0:
     com.android.tools.r8.graph.DexMethod initCause -> d
     com.android.tools.r8.graph.DexMethod getSuppressed -> c
     com.android.tools.r8.graph.DexMethod getMessage -> b
     com.android.tools.r8.graph.DexMethod addSuppressed -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):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>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):593:593 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):600:602 -> <init>
+    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):601:604 -> <init>
+    9:16:void <init>(com.android.tools.r8.graph.DexItemFactory):603:610 -> <init>
+    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):608:608 -> <init>
 com.android.tools.r8.graph.DexLibraryClass -> com.android.tools.r8.C.V0:
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():17:17 -> <clinit>
@@ -18681,10 +18719,10 @@
     boolean isLibraryClass() -> S
     boolean isNotProgramClass() -> X
     1:1:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):74:74 -> a
-    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():119:119 -> a
+    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():118:118 -> a
     2:2:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):74 -> a
     3:3:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> a
-    3:3:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():119 -> a
+    3:3:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():118 -> a
     3:3:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):74 -> a
     4:5:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):74:75 -> a
     6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):82:82 -> a
@@ -18719,39 +18757,42 @@
     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
     2:2:boolean match(com.android.tools.r8.graph.DexItem):12:12 -> a
-    3:3:int slowCompareTo(java.lang.Object):12:12 -> a
-    4:6:boolean collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):52:54 -> a
-    4:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):45 -> a
-    7:7:void collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):62:62 -> a
-    7:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):46 -> a
-    8:8:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):231:231 -> a
-    8:8:void collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):62 -> a
+    3:3:boolean match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    3:3:boolean match(com.android.tools.r8.graph.DexItem):12 -> a
+    4:4:int slowCompareTo(java.lang.Object):12:12 -> a
+    5:7:boolean collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):52:54 -> a
+    5:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):45 -> a
+    8:8:void collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):62:62 -> a
     8:8:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):46 -> a
-    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):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
-    22:22:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):143 -> a
-    23:23:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):147:147 -> a
-    24:24:int com.android.tools.r8.graph.DexProto.compareTo(com.android.tools.r8.graph.DexProto):63:63 -> a
-    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):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
-    28:28:boolean match(com.android.tools.r8.graph.DexEncodedMethod):157 -> a
-    29:29:void setSingleVirtualMethodCache(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):200:200 -> a
-    30:30:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
-    30:30:void setSingleVirtualMethodCache(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):201 -> a
-    31:33:void setSingleVirtualMethodCache(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):201:203 -> a
-    34:35:com.android.tools.r8.graph.DexEncodedMethod getSingleVirtualMethodCache(com.android.tools.r8.graph.DexType):211:212 -> a
+    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 -> a
+    9:9:void collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):62 -> a
+    9:9:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):46 -> a
+    10:10:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):67:67 -> a
+    11:11:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):139:139 -> a
+    12:12:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
+    12:12:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):139 -> a
+    13:13:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):143:143 -> a
+    14:14:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):241:241 -> a
+    14:14:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):143 -> a
+    15:15:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):147:147 -> a
+    16:16:int com.android.tools.r8.graph.DexProto.compareTo(com.android.tools.r8.graph.DexProto):63:63 -> a
+    16:16:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):147 -> 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.DexMethod,com.android.tools.r8.naming.NamingLens):143 -> a
+    18:18:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
+    18:18:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):139 -> a
+    19:19:boolean match(com.android.tools.r8.graph.DexMethod):152:152 -> a
+    20:20:void setSingleVirtualMethodCache(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):200:200 -> a
+    21:21:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
+    21:21:void setSingleVirtualMethodCache(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):201 -> a
+    22:24:void setSingleVirtualMethodCache(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):201:203 -> a
+    25:25:com.android.tools.r8.graph.DexEncodedMethod getSingleVirtualMethodCache(com.android.tools.r8.graph.DexType):211:211 -> a
+    26:26:boolean isSingleVirtualMethodCached(com.android.tools.r8.graph.DexType):207:207 -> a
+    26:26:com.android.tools.r8.graph.DexEncodedMethod getSingleVirtualMethodCache(com.android.tools.r8.graph.DexType):211 -> a
+    27:28:com.android.tools.r8.graph.DexEncodedMethod getSingleVirtualMethodCache(com.android.tools.r8.graph.DexType):211:212 -> a
     1:5:boolean computeEquals(java.lang.Object):89:93 -> b
-    6:6:boolean isSingleVirtualMethodCached(com.android.tools.r8.graph.DexType):207:207 -> b
+    6:14:int slowCompareTo(com.android.tools.r8.graph.DexMethod):113:121 -> b
+    15:15:boolean isSingleVirtualMethodCached(com.android.tools.r8.graph.DexType):207:207 -> b
     1:1:int compareTo(java.lang.Object):12:12 -> compareTo
     2:2:int compareTo(com.android.tools.r8.graph.DexMethod):108:108 -> compareTo
     2:2:int compareTo(java.lang.Object):12 -> compareTo
@@ -19021,7 +19062,7 @@
     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:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):150:150 -> d0
     13:13:void computeStaticValues():302 -> d0
     14:16:void computeStaticValues():308:310 -> d0
     1:1:com.android.tools.r8.graph.DexMethod lambda$sortEncodedMethods$1(com.android.tools.r8.graph.DexEncodedMethod):378:378 -> e
@@ -19273,19 +19314,19 @@
 com.android.tools.r8.graph.DexValue -> com.android.tools.r8.C.I1:
     com.android.tools.r8.graph.DexValue$UnknownDexValue UNKNOWN -> b
     com.android.tools.r8.graph.DexValue[] EMPTY_ARRAY -> a
-    1:3:void <clinit>():26:28 -> <clinit>
-    1:1:void <init>():25:25 -> <init>
-    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) -> a
+    1:3:void <clinit>():28:30 -> <clinit>
+    1:1:void <init>():27:27 -> <init>
+    com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo) -> a
     void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping) -> a
-    1:22:com.android.tools.r8.graph.DexValue fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):59:80 -> a
-    23:36:com.android.tools.r8.graph.DexValue fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):74:87 -> a
-    37:37:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):98:98 -> a
-    38:58:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):115:135 -> a
-    59:75:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):117:133 -> a
-    76:76:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):127:127 -> a
-    77:83:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):125:131 -> a
-    84:84:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):121:121 -> a
-    85:85:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):119:119 -> a
+    1:22:com.android.tools.r8.graph.DexValue fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):61:82 -> a
+    23:36:com.android.tools.r8.graph.DexValue fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):76:89 -> a
+    37:37:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):100:100 -> a
+    38:58:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):117:137 -> a
+    59:75:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):119:135 -> a
+    76:76:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):129:129 -> a
+    77:83:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):127:133 -> a
+    84:84:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):123:123 -> a
+    85:85:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):121:121 -> a
     java.lang.Object asAsmEncodedObject() -> h
     com.android.tools.r8.graph.DexValue$DexValueMethodHandle asDexValueMethodHandle() -> i
     com.android.tools.r8.graph.DexValue$DexValueMethodType asDexValueMethodType() -> j
@@ -19296,285 +19337,298 @@
 com.android.tools.r8.graph.DexValue$DexItemBasedValueString -> com.android.tools.r8.C.m1:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> d
-    1:1:void <clinit>():752:752 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):757:758 -> <init>
-    1:1:void com.android.tools.r8.graph.DexValue$NestedDexValue.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):688:688 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):752 -> a
-    2:6: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):777:781 -> a
-    7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):787:787 -> a
-    1:1:boolean equals(java.lang.Object):752:752 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():767:767 -> h
-    1:1:int hashCode():752:752 -> hashCode
-    1:1:java.lang.Object getBoxedValue():752:752 -> k
+    1:1:void <clinit>():776:776 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):781:782 -> <init>
+    1:1:void com.android.tools.r8.graph.DexValue$NestedDexValue.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):709:709 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):776 -> a
+    2:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):802:809 -> a
+    10:10:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):817:817 -> a
+    1:1:boolean equals(java.lang.Object):776:776 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():791:791 -> h
+    1:1:int hashCode():776:776 -> hashCode
+    1:1:java.lang.Object getBoxedValue():776:776 -> k
     void sort() -> m
     byte getValueKind() -> n
-    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():762:762 -> o
-    1:1:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():662:662 -> p
+    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():786:786 -> o
+    1:1:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():683:683 -> p
     1:1:com.android.tools.r8.graph.IndexedDexItem getValue():0 -> p
-    1:1:java.lang.String toString():752:752 -> toString
+    1:1:java.lang.String toString():776:776 -> toString
 com.android.tools.r8.graph.DexValue$DexValueAnnotation -> com.android.tools.r8.C.n1:
     com.android.tools.r8.graph.DexEncodedAnnotation value -> c
-    1:2:void <init>(com.android.tools.r8.graph.DexEncodedAnnotation):958:959 -> <init>
-    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    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):970 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):971:971 -> a
-    3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):965:965 -> a
+    1:2:void <init>(com.android.tools.r8.graph.DexEncodedAnnotation):988:989 -> <init>
+    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    1:1:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1000 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1001:1001 -> a
+    3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):995:995 -> a
     4:5:void com.android.tools.r8.graph.DexEncodedAnnotation.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):29:30 -> a
-    4:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):965 -> a
-    1:3:boolean equals(java.lang.Object):999:1001 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():981:981 -> h
-    1:1:int hashCode():991:991 -> hashCode
-    1:1:java.lang.Object getBoxedValue():976:976 -> k
-    1:1:void sort():986:986 -> m
-    1:1:java.lang.String toString():1008:1008 -> toString
+    4:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):995 -> a
+    1:3:boolean equals(java.lang.Object):1029:1031 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():1011:1011 -> h
+    1:1:int hashCode():1021:1021 -> hashCode
+    1:1:java.lang.Object getBoxedValue():1006:1006 -> k
+    1:1:void sort():1016:1016 -> m
+    1:1:java.lang.String toString():1038:1038 -> toString
 com.android.tools.r8.graph.DexValue$DexValueArray -> com.android.tools.r8.C.o1:
     com.android.tools.r8.graph.DexValue[] values -> c
-    1:2:void <init>(com.android.tools.r8.graph.DexValue[]):891:892 -> <init>
-    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    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):907 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):908:908 -> a
+    1:2:void <init>(com.android.tools.r8.graph.DexValue[]):921:922 -> <init>
+    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    1:1:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):937 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):938:938 -> a
     3:3:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):908 -> a
-    4:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):909:910 -> a
-    6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):902:902 -> a
-    1:3:boolean equals(java.lang.Object):941:943 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():921:921 -> h
-    1:1:int hashCode():933:933 -> hashCode
-    1:1:java.lang.Object getBoxedValue():916:916 -> k
-    1:2:void sort():926:927 -> m
-    1:1:com.android.tools.r8.graph.DexValue[] getValues():896:896 -> n
-    1:1:java.lang.String toString():950:950 -> toString
+    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):938 -> a
+    4:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):939:940 -> a
+    6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):932:932 -> a
+    1:3:boolean equals(java.lang.Object):971:973 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():951:951 -> h
+    1:1:int hashCode():963:963 -> hashCode
+    1:1:java.lang.Object getBoxedValue():946:946 -> k
+    1:2:void sort():956:957 -> m
+    1:1:com.android.tools.r8.graph.DexValue[] getValues():926:926 -> n
+    1:1:java.lang.String toString():980:980 -> toString
 com.android.tools.r8.graph.DexValue$DexValueBoolean -> com.android.tools.r8.C.p1:
     com.android.tools.r8.graph.DexValue$DexValueBoolean TRUE -> d
     com.android.tools.r8.graph.DexValue$DexValueBoolean FALSE -> e
     com.android.tools.r8.graph.DexValue$DexValueBoolean DEFAULT -> f
     boolean value -> c
-    1:4:void <clinit>():1068:1071 -> <clinit>
-    1:2:void <init>(boolean):1075:1076 -> <init>
+    1:4:void <clinit>():1096:1099 -> <clinit>
+    1:2:void <init>(boolean):1103:1104 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean create(boolean):1080:1080 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1094:1094 -> a
-    3:3:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    3:3:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):25 -> a
-    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1094 -> a
-    4:4: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):1122:1122 -> a
-    1:1:boolean equals(java.lang.Object):1112:1112 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():1099:1099 -> h
-    1:1:int hashCode():1104:1104 -> hashCode
-    1:1:boolean getValue():1084:1084 -> k
-    1:1:java.lang.Object getBoxedValue():1089 -> k
-    2:2:java.lang.Object getBoxedValue():1089:1089 -> k
+    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean create(boolean):1108:1108 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1122:1122 -> a
+    3:3:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    3:3:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1122 -> a
+    4:4:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1151:1151 -> a
+    1:1:boolean equals(java.lang.Object):1140:1140 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():1127:1127 -> h
+    1:1:int hashCode():1132:1132 -> hashCode
+    1:1:boolean getValue():1112:1112 -> k
+    1:1:java.lang.Object getBoxedValue():1117 -> k
+    2:2:java.lang.Object getBoxedValue():1117:1117 -> k
     boolean mayHaveSideEffects() -> l
     void sort() -> m
-    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean access$000():1066:1066 -> n
-    1:1:java.lang.String toString():1117:1117 -> toString
+    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean access$000():1094:1094 -> n
+    1:1:java.lang.String toString():1145:1145 -> toString
 com.android.tools.r8.graph.DexValue$DexValueByte -> com.android.tools.r8.C.q1:
     byte value -> c
     com.android.tools.r8.graph.DexValue$DexValueByte DEFAULT -> d
-    1:1:void <clinit>():253:253 -> <clinit>
-    1:2:void <init>(byte):257:258 -> <init>
+    1:1:void <clinit>():257:257 -> <clinit>
+    1:2:void <init>(byte):261:262 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    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):276 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):277:277 -> a
+    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    1:1:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):280 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):281:281 -> a
     3:3:int com.android.tools.r8.dex.DexOutputBuffer.putSignedEncodedValue(long,int):88:88 -> a
-    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):277 -> a
-    4:4:com.android.tools.r8.graph.DexValue$DexValueByte create(byte):262:262 -> a
-    5: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):305:305 -> a
-    1:1:boolean equals(java.lang.Object):295:295 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():282:282 -> h
-    1:1:int hashCode():287:287 -> hashCode
-    1:1:byte getValue():266:266 -> k
-    1:1:java.lang.Object getBoxedValue():271 -> k
-    2:2:java.lang.Object getBoxedValue():271:271 -> k
+    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):281 -> a
+    4:4:com.android.tools.r8.graph.DexValue$DexValueByte create(byte):266:266 -> a
+    5:5:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):310:310 -> a
+    1:1:boolean equals(java.lang.Object):299:299 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():286:286 -> h
+    1:1:int hashCode():291:291 -> hashCode
+    1:1:byte getValue():270:270 -> k
+    1:1:java.lang.Object getBoxedValue():275 -> k
+    2:2:java.lang.Object getBoxedValue():275:275 -> k
     boolean mayHaveSideEffects() -> l
     void sort() -> m
-    1:1:java.lang.String toString():300:300 -> toString
+    1:1:java.lang.String toString():304:304 -> toString
 com.android.tools.r8.graph.DexValue$DexValueChar -> com.android.tools.r8.C.r1:
     com.android.tools.r8.graph.DexValue$DexValueChar DEFAULT -> d
     char value -> c
-    1:1:void <clinit>():367:367 -> <clinit>
-    1:2:void <init>(char):370:371 -> <init>
+    1:1:void <clinit>():373:373 -> <clinit>
+    1:2:void <init>(char):376:377 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueChar create(char):375:375 -> a
-    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):389:390 -> a
+    1:1:com.android.tools.r8.graph.DexValue$DexValueChar create(char):381:381 -> a
+    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):395:396 -> a
     4:4:int com.android.tools.r8.dex.DexOutputBuffer.putUnsignedEncodedValue(long,int):92:92 -> a
-    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):390 -> a
+    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):396 -> a
     5:5:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):391 -> a
-    6:6:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    6:6:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):25 -> a
-    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):392 -> a
-    7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):393:393 -> 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):421:421 -> a
-    1:1:boolean equals(java.lang.Object):411:411 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():398:398 -> h
-    1:1:int hashCode():403:403 -> hashCode
-    1:1:char getValue():379:379 -> k
-    1:1:java.lang.Object getBoxedValue():384 -> k
-    2:2:java.lang.Object getBoxedValue():384:384 -> k
+    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):397 -> a
+    6:6:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    6:6:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):398 -> a
+    7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):399:399 -> a
+    8:8:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):428:428 -> a
+    1:1:boolean equals(java.lang.Object):417:417 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():404:404 -> h
+    1:1:int hashCode():409:409 -> hashCode
+    1:1:char getValue():385:385 -> k
+    1:1:java.lang.Object getBoxedValue():390 -> k
+    2:2:java.lang.Object getBoxedValue():390:390 -> k
     boolean mayHaveSideEffects() -> l
     void sort() -> m
-    1:1:java.lang.String toString():416:416 -> toString
+    1:1:java.lang.String toString():422:422 -> toString
 com.android.tools.r8.graph.DexValue$DexValueDouble -> com.android.tools.r8.C.s1:
     com.android.tools.r8.graph.DexValue$DexValueDouble DEFAULT -> d
     double value -> c
-    1:1:void <clinit>():596:596 -> <clinit>
-    1:2:void <init>(double):600:601 -> <init>
+    1:1:void <clinit>():611:611 -> <clinit>
+    1:2:void <init>(double):615:616 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueDouble create(double):605:605 -> a
-    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):619:620 -> a
+    1:1:com.android.tools.r8.graph.DexValue$DexValueDouble create(double):620:620 -> a
+    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):634:635 -> a
     4:4:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):621 -> a
-    5:5:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    5:5:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):25 -> a
-    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):622 -> a
-    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):623:623 -> a
-    1:2:boolean equals(java.lang.Object):641:642 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():628:628 -> h
-    1:1:int hashCode():633:633 -> hashCode
-    1:1:double getValue():609:609 -> k
-    1:1:java.lang.Object getBoxedValue():614 -> k
-    2:2:java.lang.Object getBoxedValue():614:614 -> k
+    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):636 -> a
+    5:5:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    5:5:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):637 -> a
+    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):638:638 -> a
+    7:7:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):649:649 -> a
+    8:9:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createDoubleConstant(double,com.android.tools.r8.graph.DebugLocalInfo):1012:1013 -> a
+    8:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):649 -> a
+    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createDoubleConstant(double,com.android.tools.r8.graph.DebugLocalInfo):1012:1012 -> a
+    10:10:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):649 -> a
+    1:2:boolean equals(java.lang.Object):662:663 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():643:643 -> h
+    1:1:int hashCode():654:654 -> hashCode
+    1:1:double getValue():624:624 -> k
+    1:1:java.lang.Object getBoxedValue():629 -> k
+    2:2:java.lang.Object getBoxedValue():629:629 -> k
     boolean mayHaveSideEffects() -> l
     void sort() -> m
-    1:1:double getValue():609:609 -> n
-    1:1:java.lang.String toString():647:647 -> toString
+    1:1:double getValue():624:624 -> n
+    1:1:java.lang.String toString():668:668 -> toString
 com.android.tools.r8.graph.DexValue$DexValueEnum -> com.android.tools.r8.C.t1:
-    1:1:void <init>(com.android.tools.r8.graph.DexField):849:849 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):846:846 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):860:860 -> a
-    1:1:boolean equals(java.lang.Object):846:846 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():846:846 -> h
-    1:1:int hashCode():846:846 -> hashCode
-    1:1:java.lang.Object getBoxedValue():846:846 -> k
+    1:1:void <init>(com.android.tools.r8.graph.DexField):879:879 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):876:876 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):890:890 -> a
+    1:1:boolean equals(java.lang.Object):876:876 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():876:876 -> h
+    1:1:int hashCode():876:876 -> hashCode
+    1:1:java.lang.Object getBoxedValue():876:876 -> k
     void sort() -> m
     byte getValueKind() -> n
-    1:1:java.lang.String toString():846:846 -> toString
+    1:1:java.lang.String toString():876:876 -> toString
 com.android.tools.r8.graph.DexValue$DexValueField -> com.android.tools.r8.C.u1:
-    1:1:void <init>(com.android.tools.r8.graph.DexField):813:813 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):810:810 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):824:824 -> a
-    1:1:boolean equals(java.lang.Object):810:810 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():810:810 -> h
-    1:1:int hashCode():810:810 -> hashCode
-    1:1:java.lang.Object getBoxedValue():810:810 -> k
+    1:1:void <init>(com.android.tools.r8.graph.DexField):843:843 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):840:840 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):854:854 -> a
+    1:1:boolean equals(java.lang.Object):840:840 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():840:840 -> h
+    1:1:int hashCode():840:840 -> hashCode
+    1:1:java.lang.Object getBoxedValue():840:840 -> k
     void sort() -> m
     byte getValueKind() -> n
-    1:1:java.lang.String toString():810:810 -> toString
+    1:1:java.lang.String toString():840:840 -> toString
 com.android.tools.r8.graph.DexValue$DexValueFloat -> com.android.tools.r8.C.v1:
     float value -> c
     com.android.tools.r8.graph.DexValue$DexValueFloat DEFAULT -> d
-    1:1:void <clinit>():539:539 -> <clinit>
-    1:2:void <init>(float):542:543 -> <init>
+    1:1:void <clinit>():548:548 -> <clinit>
+    1:2:void <init>(float):551:552 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueFloat create(float):547:547 -> a
-    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):561:562 -> a
+    1:1:com.android.tools.r8.graph.DexValue$DexValueFloat create(float):556:556 -> a
+    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):570:571 -> a
     4:4:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):563 -> a
-    5:5:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    5:5:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):25 -> a
-    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):564 -> a
-    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):565:565 -> a
-    1:2:boolean equals(java.lang.Object):583:584 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():570:570 -> h
-    1:1:int hashCode():575:575 -> hashCode
-    1:1:float getValue():551:551 -> k
-    1:1:java.lang.Object getBoxedValue():556 -> k
-    2:2:java.lang.Object getBoxedValue():556:556 -> k
+    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):572 -> a
+    5:5:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    5:5:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):573 -> a
+    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):574:574 -> a
+    7:7:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):585:585 -> a
+    8:9:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createFloatConstant(float,com.android.tools.r8.graph.DebugLocalInfo):1017:1018 -> a
+    8:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):585 -> a
+    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createFloatConstant(float,com.android.tools.r8.graph.DebugLocalInfo):1017:1017 -> a
+    10:10:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):585 -> a
+    1:2:boolean equals(java.lang.Object):598:599 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():579:579 -> h
+    1:1:int hashCode():590:590 -> hashCode
+    1:1:float getValue():560:560 -> k
+    1:1:java.lang.Object getBoxedValue():565 -> k
+    2:2:java.lang.Object getBoxedValue():565:565 -> k
     boolean mayHaveSideEffects() -> l
     void sort() -> m
-    1:1:float getValue():551:551 -> n
-    1:1:java.lang.String toString():589:589 -> toString
+    1:1:float getValue():560:560 -> n
+    1:1:java.lang.String toString():604:604 -> toString
 com.android.tools.r8.graph.DexValue$DexValueInt -> com.android.tools.r8.C.w1:
     int value -> c
     com.android.tools.r8.graph.DexValue$DexValueInt DEFAULT -> d
-    1:1:void <clinit>():427:427 -> <clinit>
-    1:2:void <init>(int):430:431 -> <init>
+    1:1:void <clinit>():434:434 -> <clinit>
+    1:2:void <init>(int):437:438 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):449:449 -> a
-    2:2: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):477:477 -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueInt create(int):435:435 -> b
-    1:1:boolean equals(java.lang.Object):467:467 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():454:454 -> h
-    1:1:int hashCode():459:459 -> hashCode
-    1:1:int getValue():439:439 -> k
-    1:1:java.lang.Object getBoxedValue():444 -> k
-    2:2:java.lang.Object getBoxedValue():444:444 -> k
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):456:456 -> a
+    2:2:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):485:485 -> a
+    1:1:com.android.tools.r8.graph.DexValue$DexValueInt create(int):442:442 -> b
+    1:1:boolean equals(java.lang.Object):474:474 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():461:461 -> h
+    1:1:int hashCode():466:466 -> hashCode
+    1:1:int getValue():446:446 -> k
+    1:1:java.lang.Object getBoxedValue():451 -> k
+    2:2:java.lang.Object getBoxedValue():451:451 -> k
     boolean mayHaveSideEffects() -> l
     void sort() -> m
-    1:1:java.lang.String toString():472:472 -> toString
+    1:1:java.lang.String toString():479:479 -> toString
 com.android.tools.r8.graph.DexValue$DexValueLong -> com.android.tools.r8.C.x1:
     com.android.tools.r8.graph.DexValue$DexValueLong DEFAULT -> d
     long value -> c
-    1:1:void <clinit>():483:483 -> <clinit>
-    1:2:void <init>(long):486:487 -> <init>
+    1:1:void <clinit>():491:491 -> <clinit>
+    1:2:void <init>(long):494:495 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueLong create(long):491:491 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):505:505 -> a
-    3:3: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):533:533 -> a
-    1:1:boolean equals(java.lang.Object):523:523 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():510:510 -> h
-    1:1:int hashCode():515:515 -> hashCode
-    1:1:long getValue():495:495 -> k
-    1:1:java.lang.Object getBoxedValue():500 -> k
-    2:2:java.lang.Object getBoxedValue():500:500 -> k
+    1:1:com.android.tools.r8.graph.DexValue$DexValueLong create(long):499:499 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):513:513 -> a
+    3:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):542:542 -> a
+    4:5:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createLongConstant(long,com.android.tools.r8.graph.DebugLocalInfo):1031:1032 -> a
+    4:5:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):542 -> a
+    6:6:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createLongConstant(long,com.android.tools.r8.graph.DebugLocalInfo):1031:1031 -> a
+    6:6:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):542 -> a
+    1:1:boolean equals(java.lang.Object):531:531 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():518:518 -> h
+    1:1:int hashCode():523:523 -> hashCode
+    1:1:long getValue():503:503 -> k
+    1:1:java.lang.Object getBoxedValue():508 -> k
+    2:2:java.lang.Object getBoxedValue():508:508 -> k
     boolean mayHaveSideEffects() -> l
     void sort() -> m
-    1:1:long getValue():495:495 -> n
-    1:1:java.lang.String toString():528:528 -> toString
+    1:1:long getValue():503:503 -> n
+    1:1:java.lang.String toString():536:536 -> toString
 com.android.tools.r8.graph.DexValue$DexValueMethod -> com.android.tools.r8.C.y1:
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod):831:831 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):828:828 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):842:842 -> a
-    1:1:boolean equals(java.lang.Object):828:828 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():828:828 -> h
-    1:1:int hashCode():828:828 -> hashCode
-    1:1:java.lang.Object getBoxedValue():828:828 -> k
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod):861:861 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):858:858 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):872:872 -> a
+    1:1:boolean equals(java.lang.Object):858:858 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():858:858 -> h
+    1:1:int hashCode():858:858 -> hashCode
+    1:1:java.lang.Object getBoxedValue():858:858 -> k
     void sort() -> m
     byte getValueKind() -> n
-    1:1:java.lang.String toString():828:828 -> toString
+    1:1:java.lang.String toString():858:858 -> toString
 com.android.tools.r8.graph.DexValue$DexValueMethodHandle -> com.android.tools.r8.C.z1:
-    1:1:void <init>(com.android.tools.r8.graph.DexMethodHandle):1129:1129 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1126:1126 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):1145:1145 -> a
-    1:1:boolean equals(java.lang.Object):1126:1126 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():1126:1126 -> h
-    1:1:int hashCode():1126:1126 -> hashCode
+    1:1:void <init>(com.android.tools.r8.graph.DexMethodHandle):1158:1158 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1155:1155 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):1174:1174 -> a
+    1:1:boolean equals(java.lang.Object):1155:1155 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():1155:1155 -> h
+    1:1:int hashCode():1155:1155 -> hashCode
     com.android.tools.r8.graph.DexValue$DexValueMethodHandle asDexValueMethodHandle() -> i
-    1:1:java.lang.Object getBoxedValue():1126:1126 -> k
+    1:1:java.lang.Object getBoxedValue():1155:1155 -> k
     void sort() -> m
     byte getValueKind() -> n
-    1:1:java.lang.String toString():1126:1126 -> toString
+    1:1:java.lang.String toString():1155:1155 -> toString
 com.android.tools.r8.graph.DexValue$DexValueMethodType -> com.android.tools.r8.C.A1:
-    1:1:void <init>(com.android.tools.r8.graph.DexProto):867:867 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):864:864 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):883:883 -> a
-    1:1:boolean equals(java.lang.Object):864:864 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():864:864 -> h
-    1:1:int hashCode():864:864 -> hashCode
+    1:1:void <init>(com.android.tools.r8.graph.DexProto):897:897 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):894:894 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):913:913 -> a
+    1:1:boolean equals(java.lang.Object):894:894 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():894:894 -> h
+    1:1:int hashCode():894:894 -> hashCode
     com.android.tools.r8.graph.DexValue$DexValueMethodType asDexValueMethodType() -> j
-    1:1:java.lang.Object getBoxedValue():864:864 -> k
+    1:1:java.lang.Object getBoxedValue():894:894 -> k
     void sort() -> m
     byte getValueKind() -> n
-    1:1:java.lang.String toString():864:864 -> toString
+    1:1:java.lang.String toString():894:894 -> toString
 com.android.tools.r8.graph.DexValue$DexValueNull -> com.android.tools.r8.C.B1:
     com.android.tools.r8.graph.DexValue NULL -> c
-    1:1:void <clinit>():1014:1014 -> <clinit>
-    1:1:void <init>():1017:1017 -> <init>
+    1:1:void <clinit>():1044:1044 -> <clinit>
+    1:1:void <init>():1047:1047 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    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):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):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
+    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    1:1:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1056 -> a
+    2:3:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1055:1056 -> a
+    2:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1090 -> a
+    4:4:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1055:1055 -> a
+    4:4:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1090 -> a
+    1:1:boolean equals(java.lang.Object):1079:1079 -> equals
     java.lang.Object asAsmEncodedObject() -> h
     java.lang.Object getBoxedValue() -> k
     boolean mayHaveSideEffects() -> l
@@ -19582,92 +19636,92 @@
 com.android.tools.r8.graph.DexValue$DexValueShort -> com.android.tools.r8.C.C1:
     com.android.tools.r8.graph.DexValue$DexValueShort DEFAULT -> d
     short value -> c
-    1:1:void <clinit>():311:311 -> <clinit>
-    1:2:void <init>(short):314:315 -> <init>
+    1:1:void <clinit>():316:316 -> <clinit>
+    1:2:void <init>(short):319:320 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueShort create(short):319:319 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):333:333 -> a
-    3:3: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):361:361 -> a
-    1:1:boolean equals(java.lang.Object):351:351 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():338:338 -> h
-    1:1:int hashCode():343:343 -> hashCode
-    1:1:short getValue():323:323 -> k
-    1:1:java.lang.Object getBoxedValue():328 -> k
-    2:2:java.lang.Object getBoxedValue():328:328 -> k
+    1:1:com.android.tools.r8.graph.DexValue$DexValueShort create(short):324:324 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):338:338 -> a
+    3:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):367:367 -> a
+    1:1:boolean equals(java.lang.Object):356:356 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():343:343 -> h
+    1:1:int hashCode():348:348 -> hashCode
+    1:1:short getValue():328:328 -> k
+    1:1:java.lang.Object getBoxedValue():333 -> k
+    2:2:java.lang.Object getBoxedValue():333:333 -> k
     boolean mayHaveSideEffects() -> l
     void sort() -> m
-    1:1:java.lang.String toString():356:356 -> toString
+    1:1:java.lang.String toString():361:361 -> toString
 com.android.tools.r8.graph.DexValue$DexValueString -> com.android.tools.r8.C.D1:
-    1:1:void <init>(com.android.tools.r8.graph.DexString):722:722 -> <init>
-    1:1:void com.android.tools.r8.graph.DexValue$NestedDexValue.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):688:688 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):719 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):719:719 -> a
-    3: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):737:739 -> a
-    1:1:boolean equals(java.lang.Object):719:719 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():727:727 -> h
-    1:1:int hashCode():719:719 -> hashCode
-    1:1:java.lang.Object getBoxedValue():719:719 -> k
+    1:1:void <init>(com.android.tools.r8.graph.DexString):743:743 -> <init>
+    1:1:void com.android.tools.r8.graph.DexValue$NestedDexValue.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):709:709 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):740 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):740:740 -> a
+    3:7:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):759:763 -> a
+    1:1:boolean equals(java.lang.Object):740:740 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():748:748 -> h
+    1:1:int hashCode():740:740 -> hashCode
+    1:1:java.lang.Object getBoxedValue():740:740 -> k
     boolean mayHaveSideEffects() -> l
     void sort() -> m
     byte getValueKind() -> n
-    1:1:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():662:662 -> o
+    1:1:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():683:683 -> o
     1:1:com.android.tools.r8.graph.IndexedDexItem getValue():0 -> o
-    1:1:java.lang.String toString():719:719 -> toString
+    1:1:java.lang.String toString():740:740 -> toString
 com.android.tools.r8.graph.DexValue$DexValueType -> com.android.tools.r8.C.E1:
-    1:1:void <init>(com.android.tools.r8.graph.DexType):795:795 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):792:792 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):806:806 -> a
-    1:1:boolean equals(java.lang.Object):792:792 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():792:792 -> h
-    1:1:int hashCode():792:792 -> hashCode
-    1:1:java.lang.Object getBoxedValue():792:792 -> k
+    1:1:void <init>(com.android.tools.r8.graph.DexType):825:825 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):822:822 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):836:836 -> a
+    1:1:boolean equals(java.lang.Object):822:822 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():822:822 -> h
+    1:1:int hashCode():822:822 -> hashCode
+    1:1:java.lang.Object getBoxedValue():822:822 -> k
     void sort() -> m
     byte getValueKind() -> n
-    1:1:java.lang.String toString():792:792 -> toString
+    1:1:java.lang.String toString():822:822 -> toString
 com.android.tools.r8.graph.DexValue$NestedDexValue -> com.android.tools.r8.C.F1:
     com.android.tools.r8.graph.IndexedDexItem value -> c
-    1:1:void <init>(com.android.tools.r8.graph.IndexedDexItem,com.android.tools.r8.graph.DexValue$1):651:651 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.IndexedDexItem):655:656 -> <init>
-    1:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):667:668 -> a
+    1:1:void <init>(com.android.tools.r8.graph.IndexedDexItem,com.android.tools.r8.graph.DexValue$1):672:672 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.IndexedDexItem):676:677 -> <init>
+    1:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):688:689 -> a
     3:3:int com.android.tools.r8.dex.DexOutputBuffer.putUnsignedEncodedValue(long,int):92:92 -> a
-    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):669 -> a
+    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):690 -> a
     4:4:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):670 -> a
-    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):671:671 -> a
-    6:6:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    6:6:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):25 -> a
-    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):671 -> a
-    7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):672:672 -> a
-    1:3:boolean equals(java.lang.Object):706:708 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():682:682 -> h
-    1:1:int hashCode():698:698 -> hashCode
-    1:1:java.lang.Object getBoxedValue():677:677 -> k
+    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):691 -> a
+    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):692:692 -> a
+    6:6:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    6:6:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):692 -> a
+    7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):693:693 -> a
+    1:3:boolean equals(java.lang.Object):727:729 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():703:703 -> h
+    1:1:int hashCode():719:719 -> hashCode
+    1:1:java.lang.Object getBoxedValue():698:698 -> k
     byte getValueKind() -> n
-    1:1:java.lang.String toString():715:715 -> toString
+    1:1:java.lang.String toString():736:736 -> toString
 com.android.tools.r8.graph.DexValue$SimpleDexValue -> com.android.tools.r8.C.G1:
-    1:1:void <init>():222:222 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexValue$1):222:222 -> <init>
-    1:1:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):243:243 -> a
+    1:1:void <init>():226:226 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexValue$1):226:226 -> <init>
+    1:1:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):247:247 -> a
     2:2:int com.android.tools.r8.dex.DexOutputBuffer.putSignedEncodedValue(long,int):88:88 -> a
-    2:2:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):244 -> a
+    2:2:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):248 -> a
     3:3:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    3:3:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):245 -> a
-    4:4:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    4:4:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):25 -> a
-    4:4:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):246 -> a
-    5:5:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):247:247 -> a
+    3:3:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):249 -> a
+    4:4:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    4:4:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    4:4:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):250 -> a
+    5:5:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):251:251 -> a
 com.android.tools.r8.graph.DexValue$UnknownDexValue -> com.android.tools.r8.C.H1:
     com.android.tools.r8.graph.DexValue$UnknownDexValue UNKNOWN -> c
-    1:1:void <clinit>():165:165 -> <clinit>
-    1:1:void <init>():167:167 -> <init>
-    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) -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):173:173 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):188:188 -> a
-    1:1:java.lang.Object asAsmEncodedObject():198:198 -> h
-    1:1:int hashCode():203:203 -> hashCode
-    1:1:java.lang.Object getBoxedValue():193:193 -> k
+    1:1:void <clinit>():168:168 -> <clinit>
+    1:1:void <init>():170:170 -> <init>
+    com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo) -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):176:176 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):191:191 -> a
+    1:1:java.lang.Object asAsmEncodedObject():201:201 -> h
+    1:1:int hashCode():206:206 -> hashCode
+    1:1:java.lang.Object getBoxedValue():196:196 -> k
     boolean mayHaveSideEffects() -> l
-    1:1:void sort():178:178 -> m
+    1:1:void sort():181:181 -> m
 com.android.tools.r8.graph.DirectMappedDexApplication -> com.android.tools.r8.C.L1:
     com.android.tools.r8.com.google.common.collect.ImmutableList libraryClasses -> n
     com.android.tools.r8.com.google.common.collect.ImmutableList classpathClasses -> m
@@ -19785,24 +19839,25 @@
     15:15:void extendAccessesWithContexts(java.util.Map,java.util.function.Predicate,java.util.Map):101:101 -> a
     16:19:void lambda$extendAccessesWithContexts$6(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.DexField,java.util.Set):103:106 -> a
     20:20:java.util.Set lambda$extendAccessesWithContexts$5(com.android.tools.r8.graph.DexField):105:105 -> a
-    21:26:boolean recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):150:155 -> a
-    27:27:void clearWrites():172:172 -> a
-    28:40:com.android.tools.r8.graph.FieldAccessInfoImpl rewrittenWithLens(com.android.tools.r8.graph.GraphLense):176:188 -> a
-    41:42:void lambda$rewrittenWithLens$10(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexField,java.util.Set):183:184 -> a
+    21:23:boolean isWrittenOutside(com.android.tools.r8.graph.DexEncodedMethod):154:156 -> a
+    24:29:boolean recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):167:172 -> a
+    30:30:void clearWrites():189:189 -> a
+    31:43:com.android.tools.r8.graph.FieldAccessInfoImpl rewrittenWithLens(com.android.tools.r8.graph.GraphLense):193:205 -> a
+    44:45:void lambda$rewrittenWithLens$10(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexField,java.util.Set):200:201 -> a
     1:1:com.android.tools.r8.graph.DexField getField():46:46 -> b
     2:2:boolean lambda$forEachIndirectAccess$1(java.util.Set,com.android.tools.r8.graph.DexField):68:68 -> b
     3:3:boolean lambda$forEachIndirectAccessWithContexts$3(com.android.tools.r8.graph.DexField):90:90 -> b
     4:10:void forEachReadContext(java.util.function.Consumer):116:122 -> b
-    11:16:boolean recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):159:164 -> b
-    17:18:void lambda$rewrittenWithLens$12(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexField,java.util.Set):192:193 -> b
+    11:16:boolean recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):176:181 -> b
+    17:18:void lambda$rewrittenWithLens$12(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexField,java.util.Set):209:210 -> b
     1:4:com.android.tools.r8.graph.DexEncodedMethod getUniqueReadContext():51:54 -> c
     5:5:boolean lambda$forEachIndirectAccessWithContexts$4(com.android.tools.r8.graph.DexField):92:92 -> c
     1:1:boolean isRead():132:132 -> d
-    2:2:java.util.Set lambda$recordRead$7(com.android.tools.r8.graph.DexField):154:154 -> d
+    2:2:java.util.Set lambda$recordRead$7(com.android.tools.r8.graph.DexField):171:171 -> d
     1:1:boolean isWritten():146:146 -> e
-    2:2:java.util.Set lambda$recordWrite$8(com.android.tools.r8.graph.DexField):163:163 -> e
-    1:1:java.util.Set lambda$rewrittenWithLens$11(com.android.tools.r8.graph.DexField):192:192 -> f
-    1:1:java.util.Set lambda$rewrittenWithLens$9(com.android.tools.r8.graph.DexField):183:183 -> g
+    2:2:java.util.Set lambda$recordWrite$8(com.android.tools.r8.graph.DexField):180:180 -> e
+    1:1:java.util.Set lambda$rewrittenWithLens$11(com.android.tools.r8.graph.DexField):209:209 -> f
+    1:1:java.util.Set lambda$rewrittenWithLens$9(com.android.tools.r8.graph.DexField):200:200 -> g
 com.android.tools.r8.graph.GraphLense -> com.android.tools.r8.C.b2:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():50:50 -> <clinit>
@@ -20407,8 +20462,8 @@
     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():330:330 -> c
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1048 -> c
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> c
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1050 -> c
     9:9:boolean classRequiresCode():790 -> c
     9:9:void visitEnd():798 -> c
     10:12:boolean classRequiresCode():790:792 -> c
@@ -20544,7 +20599,7 @@
     9:11:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):324 -> a
     12:12:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):325:325 -> a
     13:14:com.android.tools.r8.graph.DexType createTypeFromInternalType(java.lang.String):386:387 -> a
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     15:15:com.android.tools.r8.graph.DexType createTypeFromInternalType(java.lang.String):387 -> a
     16:16:void visitInsn(int):553:553 -> a
     17:19:void visitInsn(int):421:423 -> a
@@ -20580,16 +20635,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):1220:1220 -> a
+    280:280:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     280:280:void visitTypeInsn(int,java.lang.String):665 -> a
     281:284:void visitTypeInsn(int,java.lang.String):677:680 -> a
     285:285:void visitTypeInsn(int,java.lang.String):674:674 -> a
     286:286:void visitTypeInsn(int,java.lang.String):671:671 -> a
     287:287:void visitTypeInsn(int,java.lang.String):668:668 -> a
     288:289:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):686:687 -> a
-    290:290:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    290:290:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     290:290:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):687 -> a
-    291:291:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1239:1239 -> a
+    291:291:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1242:1242 -> a
     291:291:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):687 -> a
     292:292:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):690:690 -> a
     293:293:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):695:695 -> a
@@ -20602,7 +20657,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):1220:1220 -> a
+    344:344:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     344:344:void visitLdcInsn(java.lang.Object):783 -> a
     345:362:void visitLdcInsn(java.lang.Object):783:800 -> a
     363:367:void visitLdcInsn(java.lang.Object):798:802 -> a
@@ -20613,13 +20668,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):1220:1220 -> a
+    384:384:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     384:384:void visitMultiANewArrayInsn(java.lang.String,int):833 -> a
     385:423:void visitMultiANewArrayInsn(java.lang.String,int):833:871 -> a
     424:424:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):879:879 -> a
     425:428:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):878:881 -> a
     429:432:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):887:890 -> a
-    433:433:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    433:433:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     433:433:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):891 -> a
     434:434:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):892:892 -> a
     435:441:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):888:894 -> a
@@ -20915,9 +20970,8 @@
     int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens) -> a
     int slowCompareTo(java.lang.Object) -> a
     1:1:boolean isSorted(java.util.List):15:15 -> a
-    2:2:boolean isSorted(java.lang.Object[],java.util.function.Function):19:19 -> a
-    3:5:boolean isSorted(java.util.List,java.util.function.Function):25:27 -> a
-    6:6:int slowCompare(com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):44:44 -> a
+    2:4:boolean isSorted(java.util.List,java.util.function.Function):25:27 -> a
+    5:5:int slowCompare(com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):44:44 -> a
 com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.C.D2:
     com.android.tools.r8.graph.DexApplication application -> a
     java.util.Set visited -> b
@@ -20936,9 +20990,8 @@
     void forEachTarget(java.util.function.Consumer) -> a
     boolean hasSingleTarget() -> a
     boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions) -> a
-    1:1:java.util.Set lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):33:33 -> a
-    2:3:void lambda$lookupVirtualTargets$0(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):50:51 -> a
-    4:64:java.util.Set lookupInterfaceTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):60:120 -> a
+    1:2:void lambda$lookupVirtualTargets$0(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):50:51 -> a
+    3:63:java.util.Set lookupInterfaceTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):60:120 -> a
     com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> b
     1:12:java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):37:48 -> b
     13:13:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):107:107 -> b
@@ -21085,18 +21138,18 @@
     49:55:void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod):36 -> a
     56:56:void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod):37:37 -> a
 com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.C.Q2.b:
-    1:1:void <init>():14:14 -> <init>
+    1:1:void <init>():13:13 -> <init>
     void done() -> a
     void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist) -> a
-    void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason) -> a
+    void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod) -> a
     void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod) -> a
 com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.C.Q2.e:
     java.util.Map mapping -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):59:59 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.AppView):56:60 -> <init>
-    1:17:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):65:81 -> a
-    18:18:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):79:79 -> a
+    1:17:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):65:81 -> a
+    18:18:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):79:79 -> a
     19:19:void done():87:87 -> a
 com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1 -> com.android.tools.r8.C.Q2.c:
 com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.C.Q2.d:
@@ -21370,16 +21423,16 @@
     113:122:boolean isSubsumedBy(com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.InstructionIterator,java.util.Set):133:142 -> a
     123:123:boolean isSubsumedBy(com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.InstructionIterator,java.util.Set):141:141 -> a
     124:130:boolean definesValueWithNonLocalUsages(com.android.tools.r8.ir.code.Instruction):159:165 -> a
-    131:131:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    131:131:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     131:131:boolean valuesAreIdentical(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):178 -> a
-    132:132:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    132:132:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     132:132:boolean valuesAreIdentical(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):179 -> a
     133:136:boolean valuesAreIdentical(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):183:186 -> a
     137:179:boolean instructionsDefineIdenticalValues(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):190:232 -> a
     137:179:boolean valuesAreIdentical(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):186 -> a
-    180:180:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    180:180:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     180:180:boolean valuesAreIdentical(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):179 -> a
-    181:181:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    181:181:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     181:181:boolean valuesAreIdentical(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):178 -> a
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.ir.code.Instruction):174:174 -> b
     1:1:boolean definesBlockLocalValue(com.android.tools.r8.ir.code.Instruction):155:155 -> c
@@ -21404,28 +21457,28 @@
     48:70:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):178:200 -> a
     48:70:boolean processValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.function.Predicate):141 -> a
     48:70:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
-    71:71:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    71:71:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     71:71:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):200 -> a
     71:71:boolean processValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.function.Predicate):141 -> a
     71:71:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
     72:72:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):201:201 -> a
     72:72:boolean processValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.function.Predicate):141 -> a
     72:72:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
-    73:73:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    73:73:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     73:73:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):200 -> a
     73:73:boolean processValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.function.Predicate):141 -> a
     73:73:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
     74:75:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):204:205 -> a
     74:75:boolean processValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.function.Predicate):141 -> a
     74:75:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
-    76:76:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    76:76:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     76:76:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):205 -> a
     76:76:boolean processValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.function.Predicate):141 -> a
     76:76:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
     77:77:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):206:206 -> a
     77:77:boolean processValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.function.Predicate):141 -> a
     77:77:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
-    78:78:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    78:78:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     78:78:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):205 -> a
     78:78:boolean processValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.function.Predicate):141 -> a
     78:78:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
@@ -21458,12 +21511,12 @@
     29:48:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52 -> a
     49:54:int computeBitsRead(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField):70:75 -> a
     49:54:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52 -> a
-    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     55:55:int computeBitsRead(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField):76 -> a
     55:55:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52 -> a
     56:60:int computeBitsRead(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField):77:81 -> a
     56:60:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52 -> a
-    61:61:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    61:61:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     61:61:int computeBitsRead(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField):76 -> a
     61:61:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52 -> a
     62:62:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52:52 -> a
@@ -21608,7 +21661,7 @@
     17:17:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):136 -> a
     17:17:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     17:17:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    18:18:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    18:18:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     18:18:void rewriteInfoArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):144 -> a
     18:18:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):136 -> a
     18:18:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -21635,7 +21688,7 @@
     25:32:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):137 -> a
     25:32:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     25:32:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    33:33:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    33:33:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     33:33:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):164 -> a
     33:33:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):137 -> a
     33:33:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -21713,11 +21766,6 @@
     2:2:boolean isDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod):83 -> a
     3:4:boolean isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.DexMethod):87:88 -> a
     1:1:boolean isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):92:92 -> b
-    2:2:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexMethod):152:152 -> b
-    2:2:boolean isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):92 -> b
-    3:3:boolean isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):92:92 -> b
-    4:4:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexMethod):152:152 -> b
-    4:4:boolean isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):92 -> b
 com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.D.a.q.e:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> b
     com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder decoder -> a
@@ -21730,10 +21778,10 @@
     1:1:void <clinit>():11:11 -> <clinit>
     boolean isProto2(int) -> a
     1:3:com.android.tools.r8.ir.code.Value getInfoValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):17:19 -> a
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     4:4:com.android.tools.r8.ir.code.Value getInfoValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):19 -> a
     1:3:com.android.tools.r8.ir.code.Value getObjectsValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):24:26 -> b
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     4:4:com.android.tools.r8.ir.code.Value getObjectsValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):26 -> b
 com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.D.a.q.j:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
@@ -21763,7 +21811,7 @@
     121:121:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo run(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):89 -> a
     122:122:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo run(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):184:184 -> a
     123:123:int invalidInfoFailure():236:236 -> a
-    124:124:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    124:124:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     124:124:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClass):191 -> a
     125:132:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClass):192:199 -> a
     133:134:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexClass.lookupUniqueInstanceFieldWithName(com.android.tools.r8.graph.DexString):541:542 -> a
@@ -21772,14 +21820,14 @@
     155:155:boolean com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo.isForFieldName():0:0 -> a
     155:155:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClass):212 -> a
     156:166:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClass):222:232 -> a
-    167:167:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    167:167:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     167:167:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClass):191 -> a
     168:176:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):300:308 -> a
-    177:177:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    177:177:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     177:177:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):308 -> a
     178:188:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):309:319 -> a
     189:189:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):312:312 -> a
-    190:190:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    190:190:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     190:190:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):308 -> a
     191:191:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):301:301 -> a
     1:1:com.android.tools.r8.ir.code.Value invalidObjectsFailure():240:240 -> b
@@ -21804,28 +21852,28 @@
     1:2:boolean hasNext():325:326 -> a
     3:4:boolean isArrayPutOfInterest(com.android.tools.r8.ir.code.Instruction):358:359 -> a
     3:4:boolean hasNext():327 -> a
-    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     5:5:boolean isArrayPutOfInterest(com.android.tools.r8.ir.code.Instruction):359 -> a
     5:5:boolean hasNext():327 -> a
     6:6:boolean isArrayPutOfInterest(com.android.tools.r8.ir.code.Instruction):359:359 -> a
     6:6:boolean hasNext():327 -> a
-    7:7:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    7:7:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     7:7:boolean isArrayPutOfInterest(com.android.tools.r8.ir.code.Instruction):359 -> a
     7:7:boolean hasNext():327 -> a
     8:11:boolean hasNext():330:333 -> a
     1:7:com.android.tools.r8.ir.code.Value next():340:346 -> b
     1:7:java.lang.Object next():319 -> b
-    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     8:8:com.android.tools.r8.ir.code.Value next():346 -> b
     8:8:java.lang.Object next():319 -> b
     9:16:com.android.tools.r8.ir.code.Value next():347:354 -> b
     9:16:java.lang.Object next():319 -> b
-    17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     17:17:com.android.tools.r8.ir.code.Value next():354 -> b
     17:17:java.lang.Object next():319 -> b
     18:18:com.android.tools.r8.ir.code.Value next():350:350 -> b
     18:18:java.lang.Object next():319 -> b
-    19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     19:19:com.android.tools.r8.ir.code.Value next():346 -> b
     19:19:java.lang.Object next():319 -> b
     20:20:com.android.tools.r8.ir.code.Value next():341:341 -> b
@@ -21861,7 +21909,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):959:959 -> a
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     2:2:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):34 -> a
     3:8:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):36:41 -> a
     boolean isLiveProtoFieldObject() -> e
@@ -21882,25 +21930,25 @@
     1:15:void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod):74:88 -> a
     16:32:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):93:109 -> a
     33:33:void createProtoMessageInfoFromDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):100:100 -> a
-    34:76:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):121:163 -> a
-    77:115:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):160:198 -> a
-    116:117:int com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getHazzerBitFieldIndex(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):134:135 -> a
-    116:117:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):199 -> a
-    118:130:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):200:212 -> a
-    131:131:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):211:211 -> a
-    132:132:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):135:135 -> a
-    133:138:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):224:229 -> a
-    133:138:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):217 -> a
-    139:188:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):236:285 -> a
-    189:189:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):284:284 -> a
-    190:190:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):251:251 -> a
-    191:202:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):295:306 -> a
-    203:208:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):318:323 -> a
-    203:208:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):307 -> a
-    209:222:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):322:335 -> a
-    209:222:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):307 -> a
-    223:245:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):344:366 -> a
-    246:246:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):354:354 -> a
+    34:77:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):121:164 -> a
+    78:116:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):161:199 -> a
+    117:118:int com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getHazzerBitFieldIndex(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):134:135 -> a
+    117:118:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):200 -> a
+    119:131:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):201:213 -> a
+    132:132:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):212:212 -> a
+    133:133:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):135:135 -> a
+    134:139:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):225:230 -> a
+    134:139:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):218 -> a
+    140:189:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):237:286 -> a
+    190:190:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):285:285 -> a
+    191:191:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):252:252 -> a
+    192:203:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):296:307 -> a
+    204:209:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):319:324 -> a
+    204:209:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):308 -> a
+    210:223:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):323:336 -> a
+    210:223:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):308 -> a
+    224:246:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):345:367 -> a
+    247:247:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):355:355 -> a
 com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.D.a.q.l.d:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType type -> b
     java.util.List objects -> d
@@ -22018,7 +22066,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):959:959 -> a
+    6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     6:6:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):28 -> a
     7:7:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):31:31 -> a
 com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.D.a.q.l.m:
@@ -22027,7 +22075,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):959:959 -> a
+    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     5:5:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):27 -> a
     6:6:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):29:29 -> a
 com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.D.a.q.l.n:
@@ -22054,15 +22102,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):973:973 -> a
+    2:2:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1045:1045 -> a
     2:2:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
     3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    3:3:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):973 -> a
+    3:3:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1045 -> a
     3:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):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.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    4:4:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1045 -> a
     4:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
-    5:5:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):974:974 -> a
+    5:5:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1046:1046 -> a
     5:5:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
     com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject asProtoTypeObject() -> c
     boolean isProtoTypeObject() -> g
@@ -22535,8 +22583,8 @@
     int requiredRegisters() -> y
 com.android.tools.r8.ir.code.Add -> com.android.tools.r8.D.b.a:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():127:127 -> G2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():127:127 -> H2
     boolean isAdd() -> O0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -22555,7 +22603,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):67:67 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):82:82 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):47:47 -> f
-    int opcode() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.AlwaysMaterializingDefinition -> com.android.tools.r8.D.b.b:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):18:18 -> <init>
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -22565,9 +22613,9 @@
     4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):40:40 -> a
     5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):46:46 -> a
     6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):66:66 -> a
-    1:1:int maxInValueRegister():56:56 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():56:56 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.AlwaysMaterializingNop -> com.android.tools.r8.D.b.c:
     1:1:void <init>():19:19 -> <init>
     boolean hasInvariantOutType() -> I0
@@ -22579,9 +22627,9 @@
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49:49 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):65:65 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:int maxInValueRegister():54:54 -> v2
-    1:1:int maxOutValueRegister():59:59 -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():54:54 -> w2
+    1:1:int maxOutValueRegister():59:59 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.AlwaysMaterializingUser -> com.android.tools.r8.D.b.d:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():15:15 -> <clinit>
@@ -22596,13 +22644,13 @@
     3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):66 -> a
     4:4:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):71:71 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:2:int maxInValueRegister():54:55 -> v2
-    1:1:int maxOutValueRegister():60:60 -> w2
-    int opcode() -> x2
+    1:2:int maxInValueRegister():54:55 -> w2
+    1:1:int maxOutValueRegister():60:60 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.And -> com.android.tools.r8.D.b.e:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):19:19 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():94:94 -> G2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():94:94 -> H2
     boolean isAnd() -> Q0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
@@ -22616,7 +22664,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):64:64 -> c
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):69:69 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):54:54 -> d
-    int opcode() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Argument -> com.android.tools.r8.D.b.f:
     boolean $assertionsDisabled -> i
     boolean knownToBeBoolean -> h
@@ -22637,14 +22685,14 @@
     6:6:boolean outTypeKnownToBeBoolean(java.util.Set):114:114 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.Argument asArgument() -> d
-    1:1:int maxInValueRegister():52:52 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():52:52 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ArithmeticBinop -> com.android.tools.r8.D.b.g:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):20:20 -> <init>
-    com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode() -> G2
+    com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode() -> H2
     boolean isArithmeticBinop() -> S0
     com.android.tools.r8.code.Instruction CreateDouble(int,int,int) -> a
     1:25:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:89 -> a
@@ -22670,10 +22718,10 @@
     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>
-    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 array():57:57 -> B2
-    1:1:com.android.tools.r8.ir.code.Value index():61:61 -> C2
+    boolean throwsOnNullInput() -> B2
+    1:1:com.android.tools.r8.ir.code.Value array():57:57 -> C2
+    1:1:com.android.tools.r8.ir.code.Value index():61:61 -> D2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     boolean isArrayGet() -> T0
@@ -22742,14 +22790,14 @@
     219:219:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):276:276 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> f
-    int maxInValueRegister() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ArrayLength -> com.android.tools.r8.D.b.i:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
-    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 throwsOnNullInput() -> B2
+    1:1:com.android.tools.r8.ir.code.Value array():42:42 -> C2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     boolean isArrayLength() -> U0
@@ -22775,19 +22823,19 @@
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):88:88 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> g
-    int maxInValueRegister() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ArrayPut -> com.android.tools.r8.D.b.j:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.MemberType type -> h
     1:1:void <clinit>():30:30 -> <clinit>
     1:5:void <init>(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):40:44 -> <init>
-    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 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 throwsOnNullInput() -> B2
+    1:1:com.android.tools.r8.ir.code.Value array():58:58 -> C2
+    1:1:com.android.tools.r8.ir.code.Value index():62:62 -> D2
+    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> E2
     boolean hasInvariantOutType() -> I0
     1:5:boolean instructionInstanceCanThrow():136:140 -> M0
     boolean instructionTypeCanThrow() -> N0
@@ -22816,36 +22864,36 @@
     111:111:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):271:271 -> a
     112:112:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):271:271 -> a
     1:7:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):150:156 -> b
-    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     8:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):156 -> b
     9:14:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):157:162 -> b
-    15:15:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    15:15:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     15:15:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):162 -> b
     16:20:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):163:167 -> b
-    21:21:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    21:21:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     21:21:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):167 -> b
     22:51:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):168:197 -> b
-    52:52:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    52:52:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     52:52:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):167 -> b
-    53:53:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    53:53:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     53:53:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):162 -> b
-    54:54:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    54:54:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     54:54:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):156 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> h
-    int maxInValueRegister() -> v2
-    1:1:int maxOutValueRegister():125:125 -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():125:125 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Assume -> com.android.tools.r8.D.b.p:
     com.android.tools.r8.ir.code.Instruction origin -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.Assume$Assumption assumption -> h
     1:1:void <clinit>():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 -> B2
-    1:1:com.android.tools.r8.ir.code.Instruction origin():85:85 -> C2
+    1:1:com.android.tools.r8.ir.code.Assume$Assumption getAssumption():77:77 -> C2
     boolean isIntroducingAnAlias() -> D1
-    1:1:com.android.tools.r8.ir.code.Value src():81:81 -> D2
+    1:1:com.android.tools.r8.ir.code.Instruction origin():85:85 -> D2
+    1:1:com.android.tools.r8.ir.code.Value src():81:81 -> E2
     boolean hasInvariantOutType() -> I0
     boolean isAssume() -> W0
     1:1:boolean isAssumeDynamicType():132:132 -> X0
@@ -22859,7 +22907,7 @@
     30:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):199:199 -> a
     31:31:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):204:204 -> a
     32:36:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):224:228 -> a
-    37:37:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forAssume():236:236 -> a
+    37:37:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forAssume():235:235 -> a
     37:37:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):234 -> a
     38:45:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):239:246 -> a
     46:46:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):240:240 -> a
@@ -22887,7 +22935,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() -> e2
+    boolean isOutConstant() -> f2
     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
@@ -22912,10 +22960,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 -> v2
     1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():194:194 -> w0
-    1:1:int maxOutValueRegister():214:214 -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():209:209 -> w2
+    1:1:int maxOutValueRegister():214:214 -> x2
+    int opcode() -> y2
     1:1:boolean isAssumeNone():119:119 -> z0
     1:1:java.lang.String getInstructionName():95 -> z0
     2:2:boolean isAssumeDynamicType():132:132 -> z0
@@ -22986,351 +23034,351 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap localsAtEntry -> a
     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
+    1:2:com.android.tools.r8.ir.code.BasicBlock getUniquePredecessor():229:230 -> A
+    1:2:boolean hasCatchHandlers():543:544 -> B
+    1:1:boolean hasIncompletePhis():1132:1132 -> C
+    1:1:boolean hasOneNormalExit():1518:1518 -> D
+    1:1:boolean hasPhis():527:527 -> E
+    1:1:boolean hasUniquePredecessor():225:225 -> F
+    1:2:void incrementUnfilledPredecessorCount():667:668 -> G
+    1:1:boolean isEmpty():612:612 -> H
+    1:1:boolean isFilled():535:535 -> I
+    1:1:boolean isSealed():1120:1120 -> J
+    1:11:boolean isSimpleAlwaysThrowingPath():1495:1505 -> K
+    1:1:boolean isTrivialGoto():1450:1450 -> L
+    1:1:com.android.tools.r8.ir.code.InstructionIterator iterator():1594:1594 -> M
+    1:1:int numberOfCatchHandlers():1543:1543 -> N
+    1:1:java.util.LinkedList getInstructions():570:570 -> O
+    1:1:int numberOfThrowingInstructions():1548 -> O
+    2:3:int numberOfThrowingInstructions():1548:1549 -> O
+    1:2:void removeAllNormalSuccessors():290:291 -> P
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> P
-    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
+    3:3:void removeAllNormalSuccessors():291 -> P
+    4:12:void removeAllNormalSuccessors():292:300 -> P
+    1:9:java.lang.String toDetailedString():1173:1181 -> Q
+    10:10:boolean isFilled():535:535 -> Q
+    10:10:java.lang.String toDetailedString():1181 -> Q
+    11:12:java.lang.String toDetailedString():1181:1182 -> Q
+    13:13:boolean isSealed():1120:1120 -> Q
+    13:13:java.lang.String toDetailedString():1182 -> Q
+    14:51:java.lang.String toDetailedString():1182:1219 -> Q
+    52:52:int digits(int):1169:1169 -> Q
+    52:52:java.lang.String toDetailedString():1219 -> Q
+    53:88:java.lang.String toDetailedString():1219:1254 -> Q
+    1:3:void unlinkCatchHandler():781:783 -> R
+    1:5:com.android.tools.r8.ir.code.BasicBlock unlinkSinglePredecessor():742:746 -> S
+    1:5:void unlinkSinglePredecessorSiblingsAllowed():752:756 -> T
+    1:6:com.android.tools.r8.ir.code.BasicBlock unlinkSingleSuccessor():765:770 -> U
+    1:2:boolean verifyFilledPredecessors():682:683 -> V
+    1:2:boolean notifyPredecessorsMayChangeListeners():243:244 -> 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
+    9:17:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):266:274 -> a
+    18:18:java.util.List getPhis():531:531 -> a
+    18:18:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):275 -> a
+    19:27:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):275:283 -> a
     28:28:void com.android.tools.r8.ir.code.Phi.removeTrivialPhi():227:227 -> 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):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):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):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):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):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():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):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):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):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):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):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
+    28:28:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):284 -> a
+    29:46:void swapSuccessorsByIndex(int,int):313:330 -> a
+    47:54:void replacePredecessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):445:452 -> a
+    55:63:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):456:464 -> a
+    64:64:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180:180 -> a
+    64:64:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):464 -> a
+    65:83:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):464:482 -> a
+    84:84:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180:180 -> a
+    84:84:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):484 -> a
+    85:101:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):484:500 -> a
+    102:102:java.util.LinkedList getInstructions():570:570 -> a
+    102:102:boolean consistentBlockInstructions(boolean,boolean):65 -> a
+    103:109:boolean consistentBlockInstructions(boolean,boolean):65:71 -> a
+    110:110:java.util.List getPredecessors():234:234 -> a
+    110:110:boolean consistentBlockInstructions(boolean,boolean):72 -> a
+    111:113:boolean consistentBlockInstructions(boolean,boolean):72:74 -> a
+    114:118:boolean consistentBlockInstructions(boolean,boolean):73:77 -> a
+    119:119:java.util.LinkedList getInstructions():570:570 -> a
+    119:119:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98 -> a
+    120:121:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98:99 -> a
+    122:122:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    122:122:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):99 -> a
+    123:123:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):100:100 -> a
+    124:124:java.lang.Iterable instructionsAfter(com.android.tools.r8.ir.code.Instruction):574:574 -> a
+    125:126:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):643:644 -> a
+    127:129:void clearMark(int):656:658 -> a
+    130:130:void addPhi(com.android.tools.r8.ir.code.Phi):688:688 -> a
+    131:131:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):702:702 -> a
+    132:132:boolean isFilled():535:535 -> a
+    132:132:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):702 -> a
+    133:136:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):702:705 -> a
+    137:137:void close(com.android.tools.r8.ir.conversion.IRBuilder):709:709 -> a
+    138:138:boolean isFilled():535:535 -> a
+    138:138:void close(com.android.tools.r8.ir.conversion.IRBuilder):709 -> a
+    139:143:void close(com.android.tools.r8.ir.conversion.IRBuilder):709:713 -> a
+    144:144:boolean com.android.tools.r8.ir.code.JumpInstruction.isJumpInstruction():0:0 -> a
+    144:144:void close(com.android.tools.r8.ir.conversion.IRBuilder):713 -> a
+    145:145:void close(com.android.tools.r8.ir.conversion.IRBuilder):714:714 -> a
+    146:147:boolean verifyNoValuesAfterThrowingInstruction():1580:1581 -> a
+    146:147:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
+    148:148:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1598:1598 -> a
+    148:148:boolean verifyNoValuesAfterThrowingInstruction():1581 -> a
+    148:148:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
+    149:154:boolean verifyNoValuesAfterThrowingInstruction():1582:1587 -> a
+    149:154:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
+    155:155:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    155:155:boolean verifyNoValuesAfterThrowingInstruction():1587 -> a
+    155:155:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
+    156:156:boolean verifyNoValuesAfterThrowingInstruction():1587:1587 -> a
+    156:156:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
+    157:157:void close(com.android.tools.r8.ir.conversion.IRBuilder):715:715 -> a
+    158:169:void filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1079:1090 -> a
+    158:169:void close(com.android.tools.r8.ir.conversion.IRBuilder):716 -> a
+    170:170:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):796:796 -> a
+    171:175:boolean isCatchHandlerForSingleGuard():822:826 -> a
+    171:175:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):797 -> a
+    176:180:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):799:803 -> a
+    181:181:boolean lambda$removeCatchHandlerWithGuard$6(int,com.android.tools.r8.ir.code.BasicBlock):814:814 -> a
+    182:191:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):843:852 -> a
+    192:201:void linkCatchSuccessors(java.util.List,java.util.List):891:900 -> a
+    202:214:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):904:916 -> a
+    215:218:int numberOfNormalSuccessors():218:221 -> a
+    215:218:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):917 -> a
+    219:232:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):922:935 -> a
+    233:243:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLense):946:956 -> a
+    244:245:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1006:1007 -> a
+    244:245:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1019 -> a
+    246:248:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1021:1023 -> a
+    249:267:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1044:1062 -> a
+    268:272:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1069:1073 -> a
+    273:276:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1072:1075 -> a
+    277:278:com.android.tools.r8.ir.code.BasicBlock$EdgeType getEdgeType(com.android.tools.r8.ir.code.BasicBlock):1095:1096 -> a
+    279:283:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1124:1128 -> a
+    284:291:void appendBasicBlockList(java.lang.StringBuilder,java.util.List,java.util.function.Function):1141:1148 -> a
+    292:295:void printDebugValueSet(java.lang.String,java.util.List,java.lang.StringBuilder):1258:1261 -> a
+    296:328:void print(com.android.tools.r8.utils.CfgPrinter):1266:1298 -> a
+    329:330:void printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1302:1303 -> a
+    331:343:void removeInstructions(java.util.List):1324:1336 -> a
+    344:344:void setInstructions(java.util.LinkedList):1316:1316 -> a
+    344:344:void removeInstructions(java.util.List):1337 -> a
+    345:346:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):1361:1362 -> a
+    347:351:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1375:1379 -> a
+    352:358:com.android.tools.r8.ir.code.BasicBlock createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.Instruction[]):1410:1416 -> a
+    359:359:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1432:1432 -> a
+    360:360:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    360:360:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1432 -> a
+    361:369:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1433:1441 -> a
+    370:370:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
+    370:370:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1442 -> a
+    371:371:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
+    371:371:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1443 -> a
+    372:373:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1444:1445 -> a
+    374:375:boolean canThrow():1557:1558 -> a
+    376:376:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1606:1606 -> a
+    377:377:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1610:1610 -> a
+    377:377:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1606 -> a
+    378:378:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1610:1610 -> a
+    379:379:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1614:1614 -> a
+    380:380:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1625:1625 -> a
+    381:386:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1643:1648 -> a
+    387:387:java.util.List getSuccessors():188:188 -> a
+    387:387:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1649 -> a
+    388:393:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1649:1654 -> a
+    394:399:void moveCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1675:1680 -> a
+    394:399:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1658 -> a
+    400:404:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1662:1666 -> a
+    405:421:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1691:1707 -> a
+    422:431:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1726:1735 -> a
+    422:431:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    432:432:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    432:432:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1736 -> a
+    432:432:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    433:435:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1736:1738 -> a
+    433:435:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    436:436:java.util.LinkedList getInstructions():570:570 -> a
+    436:436:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1739 -> a
+    436:436:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    437:454:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1739:1756 -> a
+    437:454:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    455:455:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
+    455:455:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1757 -> a
+    455:455:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    456:459:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1758:1761 -> a
+    456:459:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    460:460:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
+    460:460:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1762 -> a
+    460:460:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    461:466:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1763:1768 -> a
+    461:466:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    467:467:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746:1746 -> a
+    467:467:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    468:468:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    468:468:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746 -> a
+    468:468:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    469:503:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746:1780 -> a
+    469:503:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    504:504:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):130:130 -> a
+    504:504:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1782 -> a
+    504:504:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    505:505:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    505:505:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1783 -> a
+    505:505:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    506:506:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1783:1783 -> a
+    506:506:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    507:507:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1726:1726 -> a
+    507:507:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    1:1:void lambda$notifyPredecessorsMayChangeListeners$2(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):244:244 -> b
+    2:30:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):335:363 -> b
+    31:31:java.util.LinkedList getInstructions():570:570 -> b
+    31:31:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):365 -> b
+    32:32:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):365:365 -> 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):360 -> b
-    34:34:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):360:360 -> b
+    33:33:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):367 -> b
+    34:34:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):367:367 -> 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):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
+    35:35:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):368 -> b
+    36:39:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):368:371 -> b
+    40:40:java.util.List getPredecessors():234:234 -> b
+    40:40:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):432 -> b
+    40:40:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):371 -> b
+    41:41:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):432:432 -> b
+    41:41:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):371 -> b
+    42:42:java.util.List getPredecessors():234:234 -> b
+    42:42:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):435 -> b
+    42:42:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):371 -> b
+    43:44:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):435:436 -> b
+    43:44:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):371 -> b
+    45:50:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):371:376 -> b
+    51:51:java.util.LinkedList getInstructions():570:570 -> b
+    51:51:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):377 -> b
+    52:61:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):377:386 -> b
+    62:62:java.util.LinkedList getInstructions():570:570 -> b
+    62:62:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):387 -> b
+    63:99:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):387:423 -> b
+    100:101:void removePhisByIndex(java.util.List):521:522 -> b
+    102:102:java.lang.Iterable instructionsBefore(com.android.tools.r8.ir.code.Instruction):578:578 -> b
+    103:104:void decrementUnfilledPredecessorCount(int):672:673 -> b
+    105:106:void removePhi(com.android.tools.r8.ir.code.Phi):692:693 -> b
+    107:116:void removeCatchHandlerWithGuard(com.android.tools.r8.graph.DexType):808:817 -> b
+    117:118:java.util.Set cleanForRemoval():857:858 -> b
+    119:119:java.util.List getPhis():531:531 -> b
+    119:119:java.util.Set cleanForRemoval():859 -> b
+    120:127:java.util.Set cleanForRemoval():859:866 -> b
+    128:128:java.util.List getPhis():531:531 -> b
+    128:128:java.util.Set cleanForRemoval():867 -> b
+    129:132:java.util.Set cleanForRemoval():867:870 -> b
+    133:133:java.util.List getPhis():531:531 -> b
+    133:133:java.util.Set cleanForRemoval():873 -> b
+    134:134:java.util.Set cleanForRemoval():873:873 -> b
+    135:135:java.util.LinkedList getInstructions():570:570 -> b
+    135:135:java.util.Set cleanForRemoval():874 -> b
+    136:136:java.util.Set cleanForRemoval():874:874 -> 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
+    137:137:java.util.Set cleanForRemoval():875 -> b
+    138:138:java.util.Set cleanForRemoval():876:876 -> 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
+    139:139:java.util.Set cleanForRemoval():877 -> b
+    140:147:java.util.Set cleanForRemoval():877:884 -> b
+    148:149:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1006:1007 -> b
+    148:149:boolean isOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1013 -> b
+    150:153:boolean hasCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1100:1103 -> 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
+    2:6:void swapSuccessors(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):305:309 -> c
+    7:8:boolean isMarked(int):662:663 -> c
+    9:9:boolean blocksClean(java.util.List):728:728 -> c
+    10:10:void clearCatchHandlers():1534:1534 -> c
+    11:11:com.android.tools.r8.ir.code.InstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1602:1602 -> c
+    12:21:boolean hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1884:1893 -> 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
+    22:22:boolean hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1894 -> c
+    23:25:boolean hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1894:1896 -> c
+    1:4:void link(com.android.tools.r8.ir.code.BasicBlock):721:724 -> d
+    5:5:void clearCurrentDefinitions():992:992 -> d
+    6:6:java.util.List getPhis():531:531 -> d
+    6:6:void clearCurrentDefinitions():993 -> d
+    7:8:void clearCurrentDefinitions():993:994 -> d
+    9:11:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1345:1347 -> d
+    12:12:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1598:1598 -> d
+    1:3:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):260:262 -> 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):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
+    4:4:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):262 -> e
+    5:5:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):262:262 -> e
+    6:7:void clearUserInfo():638:639 -> e
+    8:11:void mark(int):649:652 -> e
+    12:12:com.android.tools.r8.ir.code.InstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1602:1602 -> e
+    12:12:java.util.Iterator lambda$instructionsAfter$3(com.android.tools.r8.ir.code.Instruction):574 -> e
+    1:2:int numberInstructions(int):562:563 -> f
+    3:3:java.util.Iterator lambda$instructionsBefore$4(com.android.tools.r8.ir.code.Instruction):579:579 -> f
+    4:5:boolean consistentCatchHandlers():963:964 -> f
+    6:6:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlersWithSuccessorIndexes():1530:1530 -> f
+    6:6:boolean consistentCatchHandlers():965 -> f
+    7:8:boolean consistentCatchHandlers():967:968 -> f
+    9:15:boolean consistentCatchHandlers():967:973 -> 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
+    16:16:boolean consistentCatchHandlers():973 -> f
+    17:26:boolean consistentCatchHandlers():973:982 -> 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
+    27:27:boolean consistentCatchHandlers():983 -> f
+    28:31:boolean consistentCatchHandlers():983:986 -> f
+    32:33:void transferCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1538:1539 -> f
+    1:2:void setNumber(int):553:554 -> g
+    3:4:void decrementUnfilledPredecessorCount():677:678 -> g
+    5:40:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1800:1835 -> g
+    41:41:java.util.List getPredecessors():234:234 -> g
+    41:41:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1835 -> g
+    42:43:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1835:1836 -> g
+    44:44:java.util.List getPhis():531:531 -> g
+    44:44:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1836 -> g
+    45:64:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1836:1855 -> g
+    65:65:java.util.List getPredecessors():234:234 -> g
+    65:65:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1855 -> g
+    66:70:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1855:1859 -> g
+    71:71:java.util.List getPredecessors():234:234 -> g
+    71:71:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1859 -> g
+    72:87:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1859:1874 -> g
     int onThrowValueRegister(int) -> h
-    1:2:void lambda$blocksClean$5(com.android.tools.r8.ir.code.BasicBlock):723:724 -> h
-    3:17:void deduplicatePhis():1892:1906 -> h
+    1:2:void lambda$blocksClean$5(com.android.tools.r8.ir.code.BasicBlock):730:731 -> h
+    3:17:void deduplicatePhis():1927:1941 -> 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:4:void detachAllSuccessors():835:838 -> i
+    5:6:boolean verifyOnThrowWrite(int):1570:1571 -> i
+    1:2:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1162:1163 -> j
+    3:11:int guardsForCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1107:1115 -> j
+    3:11:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1163 -> j
+    12:12:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1163:1163 -> j
+    13:15:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1478:1480 -> j
+    1:1:com.android.tools.r8.ir.code.Instruction entry():616:616 -> k
+    1:2:com.android.tools.r8.ir.code.Instruction exceptionalExit():626:627 -> l
+    3:3:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1598:1598 -> l
+    3:3:com.android.tools.r8.ir.code.Instruction exceptionalExit():627 -> l
+    4:6:com.android.tools.r8.ir.code.Instruction exceptionalExit():628:630 -> l
+    1:3:com.android.tools.r8.ir.code.JumpInstruction exit():620:622 -> m
+    1:5:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlers():1522:1526 -> n
+    1:1:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlersWithSuccessorIndexes():1530:1530 -> o
+    1:1:java.util.LinkedList getInstructions():570:570 -> p
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getLocalsAtEntry():94:94 -> q
-    1:2:java.util.List getMutablePredecessors():231:232 -> r
+    1:2:java.util.List getMutablePredecessors():238:239 -> 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:7:java.util.List getNormalPredecessors():250:256 -> t
+    1:1:java.lang.String toString():1154:1154 -> 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:2:int getNumber():548:549 -> v
+    1:1:java.lang.String getNumberAsString():558:558 -> w
+    1:1:java.util.List getPhis():531:531 -> x
+    1:1:java.util.List getPredecessors():234:234 -> y
     1:1:java.util.List getSuccessors():188:188 -> z
 com.android.tools.r8.ir.code.BasicBlock$1 -> com.android.tools.r8.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
+    1:4:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):579:582 -> <init>
+    1:3:com.android.tools.r8.ir.code.Instruction advance():585:587 -> f
+    1:1:boolean hasNext():596:596 -> hasNext
+    1:5:com.android.tools.r8.ir.code.Instruction next():601:605 -> next
+    1:5:java.lang.Object next():579 -> next
+    6:6:com.android.tools.r8.ir.code.Instruction next():603:603 -> next
+    6:6:java.lang.Object next():579 -> next
 com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener -> com.android.tools.r8.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
@@ -23340,24 +23388,24 @@
     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>():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):1885 -> a
-    7:7:int doHash(java.lang.Object):1869 -> a
+    1:1:void <clinit>():1904:1904 -> <clinit>
+    1:1:void <init>():1904:1904 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.BasicBlock$1):1904:1904 -> <init>
+    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):1904:1904 -> a
+    2:4:boolean doEquivalent(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi):1907:1909 -> a
+    2:4:boolean doEquivalent(java.lang.Object,java.lang.Object):1904 -> a
+    5:5:int doHash(java.lang.Object):1904:1904 -> a
+    6:6:int doHash(com.android.tools.r8.ir.code.Phi):1919:1919 -> a
+    6:6:int doHash(java.lang.Object):1904 -> a
+    7:7:int com.android.tools.r8.ir.code.Value.hashCode():764:764 -> a
+    7:7:int doHash(com.android.tools.r8.ir.code.Phi):1920 -> a
+    7:7:int doHash(java.lang.Object):1904 -> a
 com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo -> com.android.tools.r8.D.b.u:
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo CAN_THROW -> b
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo NO_THROW -> a
     1:2:void <clinit>():104:105 -> <clinit>
     1:1:void <init>(java.lang.String,int):103:103 -> <init>
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     1:1:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):108 -> a
     2:2:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):108:108 -> a
 com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.D.b.w:
@@ -23406,117 +23454,125 @@
     26:29:com.android.tools.r8.ir.code.Value insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):205:208 -> a
     30:30:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
     30:30:com.android.tools.r8.ir.code.Value insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):209 -> a
-    31:34:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):214:217 -> a
-    35:35:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    35:35:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):218 -> a
-    36:59:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):228:251 -> a
-    60:60:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    60:60:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):251 -> a
-    61:74:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):251:264 -> a
-    75:75:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):229:229 -> a
-    76:85:void lambda$replaceCurrentInstructionWithThrowNull$1(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.BasicBlock):266:275 -> a
-    86:93:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):283:290 -> a
-    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():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
-    101:105:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):297:301 -> a
-    106:107:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> a
-    106:107:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):301 -> a
-    108:126:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):302:320 -> a
-    127:132:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):329:334 -> a
-    133:133:java.lang.Object next():28:28 -> a
-    133:133:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):334 -> a
-    134:134:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):336:336 -> a
-    135:167:void splitBlockAndCopyCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):362:394 -> a
-    168:171:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):432:435 -> a
-    172:172:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    172:172:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):435 -> a
-    173:174:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):435:436 -> a
-    175:175:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    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():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
-    186:187:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.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
-    188:205:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):460:477 -> a
-    206:206:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    206:206:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):477 -> a
-    207:214:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):477:484 -> a
-    215:215:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    215:215:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):487 -> a
-    216:219:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.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
-    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):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
-    240:240:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):508 -> a
-    241:246:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):509:514 -> a
-    247:247:void add(java.lang.Object):28:28 -> a
-    247:247:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):514 -> a
-    248:254:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):518:524 -> a
-    255:255:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    255:255:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):528 -> a
-    256: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):528:532 -> a
-    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):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
-    285:285:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):554 -> a
-    286:287:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):555:556 -> a
-    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):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
-    294:294:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):561 -> a
-    295:304:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.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:569 -> a
-    305:305:java.lang.Object next():28:28 -> a
-    305:305:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):569 -> a
-    306:307:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):570:571 -> a
-    308:308:boolean hasNext():57:57 -> a
-    308:308:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):571 -> a
-    309:316:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):571:578 -> a
-    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):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):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
-    388:391:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):641:644 -> a
-    392:392:java.lang.Object previous():28:28 -> a
-    392:392:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):644 -> a
-    393:413:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):647:667 -> a
-    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):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
-    428:428:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):683 -> a
-    429:435:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):684:690 -> a
+    31:54:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):228:251 -> a
+    55:55:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
+    55:55:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):251 -> a
+    56:69:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):251:264 -> a
+    70:70:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):229:229 -> a
+    71:80:void lambda$replaceCurrentInstructionWithThrowNull$1(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.BasicBlock):266:275 -> a
+    81:88:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):283:290 -> a
+    89:89:boolean hasNext():57:57 -> a
+    89:89:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):290 -> a
+    90:93:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):290:293 -> a
+    94:94:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
+    94:94:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):293 -> a
+    95:95:boolean hasPrevious():73:73 -> a
+    95:95:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):297 -> a
+    96:100:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):297:301 -> a
+    101:102:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> a
+    101:102:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):301 -> a
+    103:121:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):302:320 -> a
+    122:127:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):329:334 -> a
+    128:128:java.lang.Object next():28:28 -> a
+    128:128:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):334 -> a
+    129:129:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):336:336 -> a
+    130:162:void splitBlockAndCopyCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):362:394 -> a
+    163:166:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):432:435 -> a
+    167:167:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    167:167:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):435 -> a
+    168:169:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):435:436 -> a
+    170:170:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    170:170:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):436 -> a
+    171:172:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):436:437 -> a
+    173:179:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):448:454 -> a
+    180:180:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
+    180:180:boolean canThrow(com.android.tools.r8.ir.code.IRCode):342 -> a
+    180:180:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):456 -> a
+    181:182:boolean canThrow(com.android.tools.r8.ir.code.IRCode):343:344 -> a
+    181:182:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):456 -> a
+    183:200:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):460:477 -> a
+    201:201:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
+    201:201:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):477 -> a
+    202:209:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):477:484 -> a
+    210:210:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
+    210:210:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):487 -> a
+    211:214:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):487:490 -> a
+    215:215:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    215:215:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):489 -> a
+    216:216:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):491:491 -> a
+    217:217:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    217:217:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):492 -> a
+    218:231:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):492:505 -> a
+    232:232:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.InstructionListIterator.split(com.android.tools.r8.ir.code.IRCode):99:99 -> a
+    232:232:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):505 -> a
+    233:235:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):506:508 -> a
+    236:236:void add(java.lang.Object):28:28 -> a
+    236:236:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):508 -> a
+    237:242:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):509:514 -> a
+    243:243:void add(java.lang.Object):28:28 -> a
+    243:243:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):514 -> a
+    244:250:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):518:524 -> a
+    251:251:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
+    251:251:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):528 -> a
+    252:256:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):528:532 -> a
+    257:257:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
+    257:257:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):533 -> a
+    258:265:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):533:540 -> a
+    266:266:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    266:266:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):540 -> a
+    267:280:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):540:553 -> a
+    281:281:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    281:281:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):554 -> a
+    282:283:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):555:556 -> a
+    284:284:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    284:284:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):557 -> a
+    285:287:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):557:559 -> a
+    288:288:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    288:288:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):559 -> a
+    289:289:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):562:562 -> a
+    290:290:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    290:290:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):561 -> a
+    291:291:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):560:560 -> a
+    292:292:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.InstructionListIterator.split(com.android.tools.r8.ir.code.IRCode):99:99 -> a
+    292:292:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):566 -> a
+    293:295:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):567:569 -> a
+    296:296:java.lang.Object next():28:28 -> a
+    296:296:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):569 -> a
+    297:298:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):570:571 -> a
+    299:299:boolean hasNext():57:57 -> a
+    299:299:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):571 -> a
+    300:307:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):571:578 -> a
+    308:308:java.lang.Object next():28:28 -> a
+    308:308:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):578 -> a
+    309:323:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):579:593 -> a
+    324:324:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):946:946 -> a
+    324:324:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):593 -> a
+    325:338:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):596:609 -> a
+    339:355:void appendCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):409:425 -> a
+    339:355:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):610 -> a
+    356:361:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):617:622 -> a
+    362:362:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    362:362:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):622 -> a
+    363:373:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):622:632 -> a
+    374:378:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):631:635 -> a
+    379:382:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):641:644 -> a
+    383:383:java.lang.Object previous():28:28 -> a
+    383:383:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):644 -> a
+    384:404:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):647:667 -> a
+    405:405:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):130:130 -> a
+    405:405:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):672 -> a
+    406:406:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):673:673 -> a
+    407:407:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    407:407:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):673 -> a
+    408:418:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):673:683 -> a
+    419:419:java.lang.Object previous():28:28 -> a
+    419:419:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):683 -> a
+    420:426:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):684:690 -> a
+    427:427:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    427:427:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):214 -> a
+    428:429:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):216:217 -> a
+    430:430:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    430:430:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):218 -> a
     1:1:void add(java.lang.Object):28:28 -> add
     1:7:void add(com.android.tools.r8.ir.code.Instruction):102:108 -> b
     1:7:void removeOrReplaceByDebugLocalRead():172:178 -> d
@@ -23581,15 +23637,15 @@
 com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.D.b.z:
     com.android.tools.r8.ir.code.NumericType type -> h
     1:8:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:31 -> <init>
-    1:1:com.android.tools.r8.ir.code.NumericType getNumericType():36:36 -> 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
+    1:1:com.android.tools.r8.ir.code.NumericType getNumericType():36:36 -> C2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.ir.code.Value leftValue():40:40 -> E2
+    1:2:int maxInOutValueRegisterSize():82:83 -> F2
+    1:1:com.android.tools.r8.ir.code.Value rightValue():44:44 -> G2
     boolean hasInvariantOutType() -> I0
     boolean isBinop() -> Z0
     1:8:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):51:58 -> a
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1254:1254 -> a
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1256:1256 -> a
     9:9:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58 -> a
     10:10:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58:58 -> a
     11:11:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forBinop():75:75 -> a
@@ -23605,8 +23661,8 @@
     1:3:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):64 -> g
     1:3:boolean fitsInLit8Instruction(com.android.tools.r8.ir.code.Value):74:76 -> h
     com.android.tools.r8.ir.code.Binop asBinop() -> l
-    1:1:int maxInValueRegister():90:90 -> v2
-    1:1:int maxOutValueRegister():95:95 -> w2
+    1:1:int maxInValueRegister():90:90 -> w2
+    1:1:int maxOutValueRegister():95:95 -> x2
 com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.D.b.A:
     java.util.Map canonicalPositions -> b
     boolean $assertionsDisabled -> e
@@ -23645,24 +23701,25 @@
     4:4:boolean hasCatchAll(com.android.tools.r8.graph.DexItemFactory):76 -> a
     5:5:boolean hasCatchAll(com.android.tools.r8.graph.DexItemFactory):76:76 -> a
     6:6:java.util.List getAllTargets():64:64 -> a
-    7:16:com.android.tools.r8.ir.code.CatchHandlers removeGuard(com.android.tools.r8.graph.DexType):80:89 -> a
-    17:18:void lambda$removeGuard$0(com.android.tools.r8.graph.DexType,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,java.lang.Object):85:86 -> a
-    19:20:void forEach(java.util.function.BiConsumer):93:94 -> a
+    7:10:com.android.tools.r8.ir.code.CatchHandlers appendGuard(com.android.tools.r8.graph.DexType,java.lang.Object):80:83 -> a
+    11:20:com.android.tools.r8.ir.code.CatchHandlers removeGuard(com.android.tools.r8.graph.DexType):87:96 -> a
+    21:22:void lambda$removeGuard$0(com.android.tools.r8.graph.DexType,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,java.lang.Object):92:93 -> a
+    23:24:void forEach(java.util.function.BiConsumer):100:101 -> a
     1:1:java.util.List access$100(com.android.tools.r8.ir.code.CatchHandlers):17:17 -> b
     2:2:java.util.List getGuards():60:60 -> b
     1:4:java.util.Set getUniqueTargets():68:71 -> c
-    1:5:boolean equals(java.lang.Object):124:128 -> equals
-    1:1:int hashCode():133:133 -> hashCode
+    1:5:boolean equals(java.lang.Object):131:135 -> equals
+    1:1:int hashCode():140:140 -> hashCode
     1:1:boolean isEmpty():51:51 -> isEmpty
-    1:1:java.util.Iterator iterator():100:100 -> iterator
+    1:1:java.util.Iterator iterator():107:107 -> iterator
     1:2:int size():55:56 -> size
 com.android.tools.r8.ir.code.CatchHandlers$1 -> com.android.tools.r8.D.b.B:
     com.android.tools.r8.ir.code.CatchHandlers this$0 -> b
     int nextIndex -> a
-    1:3:void <init>(com.android.tools.r8.ir.code.CatchHandlers):100:102 -> <init>
-    1:1:boolean hasNext():106:106 -> hasNext
-    1:4:com.android.tools.r8.ir.code.CatchHandlers$CatchHandler next():111:114 -> next
-    1:4:java.lang.Object next():100 -> next
+    1:3:void <init>(com.android.tools.r8.ir.code.CatchHandlers):107:109 -> <init>
+    1:1:boolean hasNext():113:113 -> hasNext
+    1:4:com.android.tools.r8.ir.code.CatchHandlers$CatchHandler next():118:121 -> next
+    1:4:java.lang.Object next():107 -> next
 com.android.tools.r8.ir.code.CatchHandlers$CatchHandler -> com.android.tools.r8.D.b.C:
     java.lang.Object target -> b
     com.android.tools.r8.graph.DexType guard -> a
@@ -23672,10 +23729,10 @@
     com.android.tools.r8.graph.DexType type -> h
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):30:31 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getType():45:45 -> 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
+    1:1:com.android.tools.r8.graph.DexType getType():45:45 -> C2
+    1:1:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> D2
+    1:1:com.android.tools.r8.ir.code.Value object():49 -> D2
+    2:2:com.android.tools.r8.ir.code.Value object():49:49 -> D2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41:41 -> a
@@ -23702,15 +23759,15 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> m
     1:1:java.lang.String toString():108:108 -> toString
-    int maxInValueRegister() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.D.b.G:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.Cmp$Bias bias -> i
     1:1:void <clinit>():26:26 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):35:36 -> <init>
-    boolean isCommutative() -> C2
+    boolean isCommutative() -> D2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:28:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:84 -> a
     29:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:86 -> a
@@ -23735,9 +23792,9 @@
     com.android.tools.r8.ir.code.Cmp asCmp() -> n
     1:17:java.lang.String toString():104:120 -> toString
     18:40:java.lang.String toString():109:131 -> toString
-    int maxInValueRegister() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.D.b.F:
     com.android.tools.r8.ir.code.Cmp$Bias LT -> c
     com.android.tools.r8.ir.code.Cmp$Bias NONE -> a
@@ -23751,7 +23808,7 @@
     com.android.tools.r8.graph.DexType clazz -> h
     1:1:void <clinit>():24:24 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):29:30 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getValue():61:61 -> B2
+    1:1:com.android.tools.r8.graph.DexType getValue():61:61 -> C2
     boolean instructionInstanceCanThrow() -> M0
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):40:40 -> a
@@ -23787,12 +23844,12 @@
     54:54:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):182:182 -> a
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):131:131 -> b
     boolean isConstClass() -> c1
-    boolean isOutConstant() -> e2
+    boolean isOutConstant() -> f2
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> o
     1:1:java.lang.String toString():83:83 -> toString
-    1:1:int maxInValueRegister():72:72 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():72:72 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.D.b.I:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):33:33 -> <init>
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> D0
@@ -23808,7 +23865,7 @@
     com.android.tools.r8.graph.DexMethodHandle methodHandle -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethodHandle):25:26 -> <init>
-    1:1:com.android.tools.r8.graph.DexMethodHandle getValue():57:57 -> B2
+    1:1:com.android.tools.r8.graph.DexMethodHandle getValue():57:57 -> C2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
     2:2:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):49:49 -> a
@@ -23825,21 +23882,21 @@
     11:11:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):120 -> a
     12:12:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):126:126 -> a
     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 com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodHandle():275:275 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):85 -> a
     boolean isConstMethodHandle() -> e1
-    boolean isOutConstant() -> e2
+    boolean isOutConstant() -> f2
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> q
     1:1:java.lang.String toString():95:95 -> toString
-    1:1:int maxInValueRegister():78:78 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():78:78 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.D.b.K:
     com.android.tools.r8.graph.DexProto methodType -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProto):25:26 -> <init>
-    1:1:com.android.tools.r8.graph.DexProto getValue():57:57 -> B2
+    1:1:com.android.tools.r8.graph.DexProto getValue():57:57 -> C2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
     2:2:com.android.tools.r8.ir.code.ConstMethodType copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodType):49:49 -> a
@@ -23856,53 +23913,53 @@
     11:11:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):114 -> a
     12:12:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):120:120 -> a
     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 com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodType():279:279 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):131 -> a
-    boolean isOutConstant() -> e2
     boolean isConstMethodType() -> f1
+    boolean isOutConstant() -> f2
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> r
     1:1:java.lang.String toString():89:89 -> toString
-    1:1:int maxInValueRegister():78:78 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():78:78 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.D.b.L:
     boolean $assertionsDisabled -> i
     long value -> h
     1:1:void <clinit>():32:32 -> <clinit>
     1:6:void <init>(com.android.tools.r8.ir.code.Value,long):37:42 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value dest():68:68 -> 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:double getDoubleValue():92 -> C2
-    3:4:double getDoubleValue():92:93 -> C2
-    1:1:float getFloatValue():87:87 -> D2
+    1:1:com.android.tools.r8.ir.code.Value dest():68:68 -> C2
+    1:1:double getDoubleValue():92:92 -> D2
     2:2:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> D2
-    2:2:float getFloatValue():87 -> D2
-    3:4:float getFloatValue():87:88 -> D2
-    1:1:int getIntValue():76:76 -> E2
+    2:2:double getDoubleValue():92 -> D2
+    3:4:double getDoubleValue():92:93 -> D2
+    1:1:float getFloatValue():87:87 -> E2
     2:2:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> E2
-    2:2: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:float getFloatValue():87 -> E2
+    3:4:float getFloatValue():87:88 -> E2
+    1:1:int getIntValue():76:76 -> F2
     2:2:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> F2
-    2:2: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 isIntegerOne():109 -> J2
-    2:2:boolean isIntegerOne():109:109 -> J2
+    2:2:int getIntValue():76 -> F2
+    3:3:int getIntValue():76:76 -> F2
+    4:4:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> F2
+    4:4:int getIntValue():77 -> F2
+    5:5:int getIntValue():77:77 -> F2
+    6:8:int getIntValue():76:78 -> F2
+    1:1:long getLongValue():82:82 -> G2
+    2:2:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> G2
+    2:2:long getLongValue():82 -> G2
+    3:4:long getLongValue():82:83 -> G2
+    1:1:long getRawValue():97:97 -> H2
+    1:1:boolean is16Bit():273:273 -> I2
+    1:1:boolean is8Bit():265:265 -> J2
     1:1:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> K2
-    1:1:boolean 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
+    1:1:boolean isIntegerOne():109 -> K2
+    2:2:boolean isIntegerOne():109:109 -> K2
+    1:1:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> L2
+    1:1:boolean isIntegerZero():105 -> L2
+    2:2:boolean isIntegerZero():105:105 -> L2
+    1:1:boolean isZero():101:101 -> M2
+    1:1:boolean negativeIs16Bit():277:277 -> N2
+    1:1:boolean negativeIs8Bit():269:269 -> O2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:2:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):56:57 -> a
     3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
@@ -23985,23 +24042,23 @@
     5:5:boolean verifyTypes(com.android.tools.r8.graph.AppView):319 -> b
     6:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):319:319 -> b
     7:7:boolean verifyTypes(com.android.tools.r8.graph.AppView):317:317 -> b
-    boolean isOutConstant() -> e2
+    boolean isOutConstant() -> f2
     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 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():234:234 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.D.b.M:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexString value -> h
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> i
     1:1:void <clinit>():20:20 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):26:28 -> <init>
-    1:1:com.android.tools.r8.graph.DexString getValue():58:58 -> B2
+    1:1:com.android.tools.r8.graph.DexString getValue():58:58 -> C2
     1:11:boolean instructionInstanceCanThrow():110:120 -> M0
     1:1:boolean instructionTypeCanThrow():90:90 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -24025,7 +24082,7 @@
     13:14:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:64 -> a
     15:15:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):69:69 -> a
     16:16:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129:129 -> a
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    17:17:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     17:17:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129 -> a
     18:18:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129:129 -> a
     19:19:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):134:134 -> a
@@ -24033,13 +24090,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() -> e2
+    boolean isOutConstant() -> f2
     boolean isConstString() -> h1
     com.android.tools.r8.ir.code.ConstString asConstString() -> t
     1:1:java.lang.String toString():85:85 -> toString
-    1:1:int maxInValueRegister():74:74 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():74:74 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.D.b.N:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -24051,10 +24108,10 @@
     4:4:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):43 -> a
     5:9:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):43:47 -> a
     10:18:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):46:54 -> a
-    19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     19:19:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):20 -> a
     20:31:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):21:32 -> a
-    32:32:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    32:32:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     32:32:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):20 -> a
 com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.D.b.O:
     1:1:void <init>():19:19 -> <init>
@@ -24070,9 +24127,9 @@
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):70 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     boolean isDebugLocalRead() -> l1
-    1:1:int maxInValueRegister():59:59 -> v2
-    1:1:int maxOutValueRegister():64:64 -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():59:59 -> w2
+    1:1:int maxOutValueRegister():64:64 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.D.b.P:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):21:21 -> <init>
     boolean isAllowedAfterThrowingInstruction() -> P0
@@ -24093,7 +24150,7 @@
     6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
     6:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):71 -> a
     7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):71:71 -> a
-    boolean isOutConstant() -> e2
+    boolean isOutConstant() -> f2
     boolean isDebugLocalWrite() -> n1
     com.android.tools.r8.ir.code.DebugLocalWrite asDebugLocalWrite() -> u
 com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.D.b.S:
@@ -24102,8 +24159,8 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap ending -> h
     1:1:void <clinit>():19:19 -> <clinit>
     1:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):26:29 -> <init>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():43:43 -> B2
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():47:47 -> C2
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():43:43 -> C2
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():47:47 -> D2
     boolean hasInvariantOutType() -> I0
     boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -24124,9 +24181,9 @@
     boolean isDebugLocalsChange() -> o1
     1:6:java.lang.String toString():92:97 -> toString
     com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> v
-    1:1:int maxInValueRegister():77:77 -> v2
-    1:1:int maxOutValueRegister():82:82 -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():77:77 -> w2
+    1:1:int maxOutValueRegister():82:82 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.D.b.T:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():16:16 -> <clinit>
@@ -24143,10 +24200,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):66 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     boolean isDebugPosition() -> p1
-    1:1:int maxInValueRegister():55:55 -> v2
     com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> w
-    1:1:int maxOutValueRegister():60:60 -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():55:55 -> w2
+    1:1:int maxOutValueRegister():60:60 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.D.b.U:
     1:1:void <init>():7:7 -> <init>
     java.lang.Object handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction) -> a
@@ -24168,8 +24225,8 @@
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> i
     1:1:void <clinit>():22:22 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):33:36 -> <init>
-    1:1:com.android.tools.r8.graph.DexReference getItem():63:63 -> B2
-    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():67:67 -> C2
+    1:1:com.android.tools.r8.graph.DexReference getItem():63:63 -> C2
+    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():67:67 -> D2
     boolean instructionInstanceCanThrow() -> M0
     1:1:boolean instructionTypeCanThrow():113:113 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -24200,17 +24257,17 @@
     21:21:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):146:146 -> a
     22:22:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):151:151 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isOutConstant() -> e2
+    boolean isOutConstant() -> f2
     boolean isDexItemBasedConstString() -> q1
     1:1:java.lang.String toString():108:108 -> toString
-    1:1:int maxInValueRegister():97:97 -> v2
-    int maxOutValueRegister() -> w2
+    1:1:int maxInValueRegister():97:97 -> w2
     com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> x
-    int opcode() -> x2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Div -> com.android.tools.r8.D.b.W:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> G2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> H2
     1:1:boolean instructionTypeCanThrow():134:134 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -24230,8 +24287,8 @@
     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() -> r1
-    int opcode() -> x2
     com.android.tools.r8.ir.code.Div asDiv() -> y
+    int opcode() -> y2
 com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.D.b.a0:
     com.android.tools.r8.ir.code.BasicBlock[] sorted -> a
     com.android.tools.r8.ir.code.BasicBlock[] doms -> b
@@ -24290,19 +24347,19 @@
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):21:21 -> <init>
     2:3:void <init>(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.Value):25:26 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> B2
-    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():51 -> 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 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
+    1:1:com.android.tools.r8.ir.code.StackValue outBottom():55 -> C2
     2:2:com.android.tools.r8.ir.code.StackValue[] getStackValues():51:51 -> C2
-    2:2:com.android.tools.r8.ir.code.StackValue 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
+    2:2:com.android.tools.r8.ir.code.StackValue outBottom():55 -> C2
+    3:3:com.android.tools.r8.ir.code.StackValue outBottom():55:55 -> C2
+    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> D2
+    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():51 -> D2
+    1:1:com.android.tools.r8.ir.code.StackValue outTop():59 -> D2
+    2:2:com.android.tools.r8.ir.code.StackValue[] getStackValues():51:51 -> D2
+    2:2:com.android.tools.r8.ir.code.StackValue outTop():59 -> D2
+    3:3:com.android.tools.r8.ir.code.StackValue outTop():59:59 -> D2
+    1:1:com.android.tools.r8.ir.code.StackValue src():63:63 -> E2
     boolean hasInvariantOutType() -> I0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -24314,9 +24371,9 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):41:46 -> e
     boolean isDup() -> s1
-    int maxInValueRegister() -> v2
-    1:1:int maxOutValueRegister():92:92 -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():92:92 -> x2
+    int opcode() -> y2
     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
@@ -24334,9 +24391,9 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):55:60 -> e
     boolean isDup2() -> t1
-    int maxInValueRegister() -> v2
-    1:1:int maxOutValueRegister():106:106 -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():106:106 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.D.b.d0:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexField field -> h
@@ -24344,12 +24401,12 @@
     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 -> B2
-    1:1:com.android.tools.r8.ir.code.FieldMemberType getType():39:39 -> C2
-    com.android.tools.r8.ir.code.Value value() -> D2
+    1:1:com.android.tools.r8.graph.DexField getField():43:43 -> C2
+    1:1:com.android.tools.r8.ir.code.FieldMemberType getType():39:39 -> D2
+    com.android.tools.r8.ir.code.Value value() -> E2
     boolean hasInvariantOutType() -> I0
     1:24:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):59:82 -> a
-    25:25:boolean com.android.tools.r8.graph.DexEncodedField.isStaticMember():124:124 -> a
+    25:25:boolean com.android.tools.r8.graph.DexEncodedField.isStaticMember():123:123 -> a
     25:25:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):86 -> a
     26:43:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):87:104 -> a
     44:44:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
@@ -24399,7 +24456,7 @@
     1:3:void <init>(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,int):16:18 -> <init>
     boolean isConstant() -> D
     boolean isFixedRegisterValue() -> F
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():1186:1186 -> V
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():1199:1199 -> V
     1:1:com.android.tools.r8.ir.code.ValueType outType():23 -> V
     2:23:com.android.tools.r8.ir.code.ValueType outType():24:45 -> V
     24:25:com.android.tools.r8.ir.code.ValueType outType():42:43 -> V
@@ -24411,7 +24468,7 @@
     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 -> C2
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():36:39 -> D2
     boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -24420,7 +24477,7 @@
     4:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):85:85 -> a
     5:5:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):104:104 -> a
     6:6:void com.android.tools.r8.ir.code.BasicBlockIterator.<init>(com.android.tools.r8.ir.code.IRCode):17:17 -> a
-    6:6:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator():893 -> a
+    6:6:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator():942 -> a
     6:6:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):105 -> a
     7:7:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():27:27 -> a
     7:7:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):106 -> a
@@ -24433,14 +24490,14 @@
     10:10:java.lang.Object com.android.tools.r8.ir.code.BasicBlockIterator.next():9 -> a
     10:10:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):109 -> a
     11:11:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):109:109 -> a
-    12:12:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator():893:893 -> a
+    12:12:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator():942:942 -> a
     12:12:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):105 -> a
     13:13:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):117:117 -> a
     1:4:java.lang.String toString():71:74 -> toString
-    1:1:int maxInValueRegister():59:59 -> v2
-    1:1:int maxOutValueRegister():65:65 -> w2
+    1:1:int maxInValueRegister():59:59 -> w2
     boolean isGoto() -> x1
-    int opcode() -> x2
+    1:1:int maxOutValueRegister():65:65 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.D.b.j0:
     com.android.tools.r8.ir.code.ValueNumberGenerator valueNumberGenerator -> c
     com.android.tools.r8.graph.DexEncodedMethod method -> a
@@ -24453,272 +24510,294 @@
     com.android.tools.r8.utils.InternalOptions options -> i
     com.android.tools.r8.origin.Origin origin -> j
     java.util.LinkedList blocks -> b
-    1:1:void <clinit>():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():804:815 -> A
-    1:8:boolean verifyNoNullabilityBottomTypes():819:826 -> B
-    1:14:boolean verifySplitCriticalEdges():325:338 -> C
-    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):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):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):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
+    1:1:void <clinit>():48:48 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod,java.util.LinkedList,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):122:122 -> <init>
+    2:32:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod,java.util.LinkedList,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):102:132 -> <init>
+    1:20:void traceBlocks():397:416 -> A
+    21:33:void traceBlocks():415:427 -> A
+    34:34:boolean noColorsInUse():1145:1145 -> A
+    34:34:void traceBlocks():427 -> A
+    35:35:void traceBlocks():427:427 -> A
+    1:12:boolean verifyNoImpreciseOrBottomTypes():849:860 -> B
+    1:8:boolean verifyNoNullabilityBottomTypes():864:871 -> C
+    1:14:boolean verifySplitCriticalEdges():370:383 -> D
+    1:6:boolean computeAllThrowingInstructionsHavePositions():1068:1073 -> E
+    1:12:boolean verifyNoValueWithOnlyAssumeInstructionAsUsers():875:886 -> F
+    1:17:boolean controlFlowMayDependOnEnvironment(com.android.tools.r8.graph.AppView):263:279 -> a
+    18:18:boolean lambda$prepareBlocksForCatchHandlers$0(com.android.tools.r8.ir.code.BasicBlock):331:331 -> a
+    19:23:void ensureBlockNumbering():431:435 -> a
+    19:23:void print(com.android.tools.r8.utils.CfgPrinter):537 -> a
+    24:25:void print(com.android.tools.r8.utils.CfgPrinter):538:539 -> a
+    26:26:boolean lambda$verifyTypes$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.BasicBlock):589:589 -> a
+    27:27:void lambda$consistentBlockNumbering$2(java.lang.Integer,java.lang.Long):744:744 -> a
+    28:34:boolean lambda$verifyNoImpreciseOrBottomTypes$3(com.android.tools.r8.ir.code.Value):851:857 -> a
+    35:35:boolean lambda$verifyNoImpreciseOrBottomTypes$3(com.android.tools.r8.ir.code.Value):856:856 -> a
+    36:39:boolean lambda$wrapSSAVerifierWithStackValueHandling$8(java.util.function.Predicate,com.android.tools.r8.ir.code.Value):893:896 -> a
+    40:40:java.lang.Iterable instructions(java.util.function.Predicate):920:920 -> a
+    41:42:java.util.List collectArguments(boolean):976:977 -> a
+    41:42:java.util.List collectArguments():972 -> a
+    43:43:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> a
+    43:43:java.util.List collectArguments(boolean):977 -> a
+    43:43:java.util.List collectArguments():972 -> a
+    44:47:java.util.List collectArguments(boolean):978:981 -> a
+    44:47:java.util.List collectArguments():972 -> a
+    48:48:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    48:48:java.util.List collectArguments(boolean):981 -> a
+    48:48:java.util.List collectArguments():972 -> a
+    49:54:java.util.List collectArguments(boolean):983:988 -> a
+    49:54:java.util.List collectArguments():972 -> a
+    55:55:java.util.List collectArguments(boolean):987:987 -> a
+    55:55:java.util.List collectArguments():972 -> a
+    56:56:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> a
+    56:56:java.util.List collectArguments(boolean):977 -> a
+    56:56:java.util.List collectArguments():972 -> a
+    57:57:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):1004:1004 -> a
+    58:59:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int,com.android.tools.r8.graph.DebugLocalInfo):1026:1027 -> a
+    60:60:void setAllThrowingInstructionsHavePositions(boolean):1064:1064 -> a
+    61:64:void removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):1093:1096 -> a
+    65:65:boolean isMarkingColorInUse(int):1132:1132 -> a
+    66:66:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1149:1149 -> a
+    67:75:java.util.Set getBlocksReachableFromExclusive(com.android.tools.r8.ir.code.BasicBlock):1174:1182 -> a
+    67:75:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1150 -> a
+    76:81:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1151:1156 -> a
+    82:82:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    82:82:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1156 -> a
+    83:89:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1157:1163 -> a
     90:90:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    90:90:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):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
+    90:90:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1163 -> a
+    91:91:void markTransitiveSuccessors(java.util.Deque,int):1221:1221 -> a
+    92:92:boolean isMarkingColorInUse(int):1132:1132 -> a
+    92:92:void markTransitiveSuccessors(java.util.Deque,int):1221 -> a
+    93:94:boolean anyBlocksMarkedWithColor(int):1136:1137 -> a
+    93:94:void markTransitiveSuccessors(java.util.Deque,int):1221 -> a
+    95:104:void markTransitiveSuccessors(java.util.Deque,int):1221:1230 -> a
+    105:105:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1242:1242 -> a
+    106:106:boolean isMarkingColorInUse(int):1132:1132 -> a
+    106:106:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1242 -> a
+    107:118:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1242:1253 -> a
+    119:119:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(com.android.tools.r8.ir.code.Instruction):1602:1602 -> a
+    119:119:java.util.Iterator lambda$getInstructionsReachableFrom$10(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):1161 -> a
+    1:52:java.util.Map computeLiveAtEntrySets():147:198 -> b
+    53:56:java.util.Map computeLiveAtEntrySets():197:200 -> b
     57:57:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasPrevious():73:73 -> b
-    57:57:java.util.Map computeLiveAtEntrySets():202 -> b
-    58:58:java.util.Map computeLiveAtEntrySets():203:203 -> b
+    57:57:java.util.Map computeLiveAtEntrySets():200 -> b
+    58:58:java.util.Map computeLiveAtEntrySets():201:201 -> b
     59:59:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> b
-    59:59:java.util.Map computeLiveAtEntrySets():204 -> b
-    60:73:java.util.Map computeLiveAtEntrySets():206:219 -> b
+    59:59:java.util.Map computeLiveAtEntrySets():202 -> b
+    60:73:java.util.Map computeLiveAtEntrySets():204:217 -> b
     74:74:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> b
-    74:74:java.util.Map computeLiveAtEntrySets():223 -> b
-    75:110:java.util.Map computeLiveAtEntrySets():223:258 -> b
-    111:111:boolean com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets.isEmpty():78:78 -> b
-    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):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):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):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():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
+    74:74:java.util.Map computeLiveAtEntrySets():221 -> b
+    75:110:java.util.Map computeLiveAtEntrySets():221:256 -> b
+    111:111:boolean com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets.isEmpty():81:81 -> b
+    111:111:java.util.Map computeLiveAtEntrySets():256 -> b
+    112:114:java.util.Map computeLiveAtEntrySets():256:258 -> b
+    115:125:boolean hasNoVerticallyMergedClasses(com.android.tools.r8.graph.AppView):554:564 -> b
+    126:128:boolean lambda$verifyNoNullabilityBottomTypes$4(com.android.tools.r8.ir.code.Value):866:868 -> b
+    129:129:boolean lambda$verifyNoNullabilityBottomTypes$4(com.android.tools.r8.ir.code.Value):866:866 -> b
+    130:130:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():924:924 -> b
+    130:130:java.util.Iterator lambda$instructions$9(java.util.function.Predicate):920 -> b
+    131:131:java.util.Iterator lambda$instructions$9(java.util.function.Predicate):920:920 -> b
+    132:132:java.util.ListIterator listIterator(int):946:946 -> b
+    133:133:boolean lambda$findFirstNonNonePosition$11(com.android.tools.r8.ir.code.Instruction):1261:1261 -> b
+    1:2:boolean verifyTypes(com.android.tools.r8.graph.AppView):585:586 -> c
+    3:6:boolean validAssumeDynamicTypeInstructions(com.android.tools.r8.graph.AppView):594:597 -> c
+    3:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):586 -> c
+    7:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):587:589 -> c
+    10:15:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$7(com.android.tools.r8.ir.code.Value):877:882 -> c
+    16:22:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$7(com.android.tools.r8.ir.code.Value):877:883 -> c
+    23:23:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$5(com.android.tools.r8.ir.code.Instruction):878:878 -> c
+    24:27:boolean verifySSATypeLattice(java.util.function.Predicate):902:905 -> c
+    28:28:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> c
+    28:28:boolean verifySSATypeLattice(java.util.function.Predicate):905 -> c
+    29:33:boolean verifySSATypeLattice(java.util.function.Predicate):905:909 -> c
+    34:40:java.util.List computeNormalExitBlocks():932:938 -> c
+    41:41:void returnMarkingColor(int):1126:1126 -> c
+    42:42:boolean isMarkingColorInUse(int):1132:1132 -> c
+    42:42:void returnMarkingColor(int):1126 -> c
+    43:43:void returnMarkingColor(int):1126:1126 -> c
+    44:45:void clearMarks(int):452:453 -> c
+    44:45:void returnMarkingColor(int):1127 -> c
+    46:46:void returnMarkingColor(int):1128:1128 -> c
+    1:4:boolean consistentBlockNumbering():739:742 -> d
+    5:5:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$6(com.android.tools.r8.ir.code.Instruction):881:881 -> d
+    6:6:java.util.function.Predicate wrapSSAVerifierWithStackValueHandling(java.util.function.Predicate):890:890 -> d
+    1:1:com.android.tools.r8.ir.code.ConstNumber createConstNull():1050:1050 -> e
+    2:2:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> e
+    2:2:com.android.tools.r8.ir.code.ConstNumber createConstNull():1050 -> e
+    3:3:com.android.tools.r8.ir.code.ConstNumber createConstNull():1051:1051 -> e
+    1:1:boolean doAllThrowingInstructionsHavePositions():1060:1060 -> f
+    1:1:com.android.tools.r8.ir.code.BasicBlock entryBlock():140:140 -> g
+    1:1:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1261:1261 -> h
+    2:2:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> h
+    2:2:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1261 -> h
+    3:16:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1261:1274 -> h
+    17:17:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> h
+    17:17:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1261 -> h
+    1:1:int getHighestBlockNumber():1040:1040 -> i
+    1:1:int getNextInstructionNumber():968:968 -> j
+    1:4:com.android.tools.r8.ir.code.Value getThis():993:996 -> k
+    5:5:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> k
+    5:5:com.android.tools.r8.ir.code.Value getThis():996 -> k
+    6:8:com.android.tools.r8.ir.code.Value getThis():996:998 -> k
     9:9:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> k
-    9:9:com.android.tools.r8.ir.code.Value getThis():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():1073:1073 -> o
-    2:2:boolean isConsistentGraph():527 -> o
-    3:5:boolean isConsistentGraph():527:529 -> o
-    6:21:boolean consistentPredecessorSuccessors():665:680 -> o
-    6:21:boolean isConsistentGraph():529 -> o
-    22:22:boolean isConsistentGraph():530:530 -> o
-    23:24:boolean consistentCatchHandlers():687:688 -> o
-    23:24:boolean isConsistentGraph():530 -> o
-    25:25:boolean isConsistentGraph():531:531 -> o
-    26:29:boolean consistentBlockInstructions():706:709 -> o
-    26:29:boolean isConsistentGraph():531 -> o
-    30:30:boolean consistentBlockInstructions():707:707 -> o
-    30:30:boolean isConsistentGraph():531 -> o
-    31:31:boolean isConsistentGraph():532:532 -> o
-    32:88:boolean consistentMetadata():716:772 -> o
-    32:88:boolean isConsistentGraph():532 -> o
-    89:89:boolean isConsistentGraph():533:533 -> o
-    1:2:boolean isConsistentSSA():499:500 -> p
-    3:19:boolean consistentDefUseChains():589:605 -> p
-    3:19:boolean isConsistentSSA():500 -> p
+    9:9:com.android.tools.r8.ir.code.Value getThis():998 -> k
+    10:10:com.android.tools.r8.ir.code.Value getThis():999:999 -> k
+    11:11:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> k
+    11:11:com.android.tools.r8.ir.code.Value getThis():996 -> k
+    1:3:java.util.Set getUnreachableBlocks():1187:1189 -> l
+    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1217:1217 -> l
+    4:4:java.util.Set getUnreachableBlocks():1189 -> l
+    5:10:java.util.Set getUnreachableBlocks():1190:1195 -> l
+    1:1:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():924:924 -> m
+    1:1:java.lang.Iterable instructions():916:916 -> n
+    1:1:boolean isConsistentGraph():572:572 -> o
+    2:2:boolean noColorsInUse():1145:1145 -> o
+    2:2:boolean isConsistentGraph():572 -> o
+    3:5:boolean isConsistentGraph():572:574 -> o
+    6:21:boolean consistentPredecessorSuccessors():710:725 -> o
+    6:21:boolean isConsistentGraph():574 -> o
+    22:22:boolean isConsistentGraph():575:575 -> o
+    23:24:boolean consistentCatchHandlers():732:733 -> o
+    23:24:boolean isConsistentGraph():575 -> o
+    25:25:boolean isConsistentGraph():576:576 -> o
+    26:29:boolean consistentBlockInstructions():751:754 -> o
+    26:29:boolean isConsistentGraph():576 -> o
+    30:30:boolean consistentBlockInstructions():752:752 -> o
+    30:30:boolean isConsistentGraph():576 -> o
+    31:31:boolean isConsistentGraph():577:577 -> o
+    32:88:boolean consistentMetadata():761:817 -> o
+    32:88:boolean isConsistentGraph():577 -> o
+    89:89:boolean isConsistentGraph():578:578 -> o
+    1:2:boolean isConsistentSSA():544:545 -> p
+    3:19:boolean consistentDefUseChains():634:650 -> p
+    3:19:boolean isConsistentSSA():545 -> p
     20:20:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> p
-    20:20:boolean consistentDefUseChains():606 -> p
-    20:20:boolean isConsistentSSA():500 -> p
-    21:22:boolean consistentDefUseChains():608:609 -> p
-    21:22:boolean isConsistentSSA():500 -> p
+    20:20:boolean consistentDefUseChains():651 -> p
+    20:20:boolean isConsistentSSA():545 -> p
+    21:22:boolean consistentDefUseChains():653:654 -> p
+    21:22:boolean isConsistentSSA():545 -> p
     23:23:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> p
-    23:23:boolean consistentDefUseChains():611 -> p
-    23:23:boolean isConsistentSSA():500 -> p
-    24:36:boolean consistentDefUseChains():611:623 -> p
-    24:36:boolean isConsistentSSA():500 -> p
-    37:37:boolean verifyValue(com.android.tools.r8.ir.code.Value):631:631 -> p
-    37:37:boolean consistentDefUseChains():623 -> p
-    37:37:boolean isConsistentSSA():500 -> p
-    38:38:boolean verifyPhi(com.android.tools.r8.ir.code.Phi):636:636 -> p
-    38:38:boolean verifyValue(com.android.tools.r8.ir.code.Value):631 -> p
-    38:38:boolean consistentDefUseChains():623 -> p
-    38:38:boolean isConsistentSSA():500 -> p
-    39:39:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):641:641 -> p
-    39:39:boolean verifyValue(com.android.tools.r8.ir.code.Value):631 -> p
-    39:39:boolean consistentDefUseChains():623 -> p
-    39:39:boolean isConsistentSSA():500 -> p
+    23:23:boolean consistentDefUseChains():656 -> p
+    23:23:boolean isConsistentSSA():545 -> p
+    24:36:boolean consistentDefUseChains():656:668 -> p
+    24:36:boolean isConsistentSSA():545 -> p
+    37:37:boolean verifyValue(com.android.tools.r8.ir.code.Value):676:676 -> p
+    37:37:boolean consistentDefUseChains():668 -> p
+    37:37:boolean isConsistentSSA():545 -> p
+    38:38:boolean verifyPhi(com.android.tools.r8.ir.code.Phi):681:681 -> p
+    38:38:boolean verifyValue(com.android.tools.r8.ir.code.Value):676 -> p
+    38:38:boolean consistentDefUseChains():668 -> p
+    38:38:boolean isConsistentSSA():545 -> p
+    39:39:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):686:686 -> p
+    39:39:boolean verifyValue(com.android.tools.r8.ir.code.Value):676 -> p
+    39:39:boolean consistentDefUseChains():668 -> p
+    39:39:boolean isConsistentSSA():545 -> p
     40:40:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> p
-    40:40:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):641 -> p
-    40:40:boolean verifyValue(com.android.tools.r8.ir.code.Value):631 -> p
-    40:40:boolean consistentDefUseChains():623 -> p
-    40:40:boolean isConsistentSSA():500 -> p
-    41:43:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):642:644 -> p
-    41:43:boolean verifyValue(com.android.tools.r8.ir.code.Value):631 -> p
-    41:43:boolean consistentDefUseChains():623 -> p
-    41:43:boolean isConsistentSSA():500 -> p
-    44:44:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):642:642 -> p
-    44:44:boolean verifyValue(com.android.tools.r8.ir.code.Value):631 -> p
-    44:44:boolean consistentDefUseChains():623 -> p
-    44:44:boolean isConsistentSSA():500 -> p
-    45:45:boolean consistentDefUseChains():624:624 -> p
-    45:45:boolean isConsistentSSA():500 -> p
-    46:47:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):649:650 -> p
-    46:47:boolean consistentDefUseChains():624 -> p
-    46:47:boolean isConsistentSSA():500 -> p
+    40:40:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):686 -> p
+    40:40:boolean verifyValue(com.android.tools.r8.ir.code.Value):676 -> p
+    40:40:boolean consistentDefUseChains():668 -> p
+    40:40:boolean isConsistentSSA():545 -> p
+    41:43:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):687:689 -> p
+    41:43:boolean verifyValue(com.android.tools.r8.ir.code.Value):676 -> p
+    41:43:boolean consistentDefUseChains():668 -> p
+    41:43:boolean isConsistentSSA():545 -> p
+    44:44:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):687:687 -> p
+    44:44:boolean verifyValue(com.android.tools.r8.ir.code.Value):676 -> p
+    44:44:boolean consistentDefUseChains():668 -> p
+    44:44:boolean isConsistentSSA():545 -> p
+    45:45:boolean consistentDefUseChains():669:669 -> p
+    45:45:boolean isConsistentSSA():545 -> p
+    46:47:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):694:695 -> p
+    46:47:boolean consistentDefUseChains():669 -> p
+    46:47:boolean isConsistentSSA():545 -> p
     48:48:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> p
-    48:48:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):650 -> p
-    48:48:boolean consistentDefUseChains():624 -> p
-    48:48:boolean isConsistentSSA():500 -> p
-    49:57:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):650:658 -> p
-    49:57:boolean consistentDefUseChains():624 -> p
-    49:57:boolean isConsistentSSA():500 -> p
-    58:58:boolean isConsistentSSA():501:501 -> p
-    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():901:903 -> s
-    1:7:int numberRemainingInstructions():909:915 -> t
-    1:7:java.lang.String toString():397:403 -> toString
-    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():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():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():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():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():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():1136 -> v
-    14:17:void com.android.tools.r8.ir.code.BasicBlockIterator.remove():84:87 -> v
-    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():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
-    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():441 -> y
-    25:25:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():442:442 -> y
-    26:37:com.android.tools.r8.com.google.common.collect.ImmutableList reorderExceptionalBlocksLastForTesting(com.android.tools.r8.com.google.common.collect.ImmutableList):477:488 -> y
-    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():1073:1073 -> z
-    34:34:void traceBlocks():382 -> z
-    35:35:void traceBlocks():382:382 -> z
+    48:48:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):695 -> p
+    48:48:boolean consistentDefUseChains():669 -> p
+    48:48:boolean isConsistentSSA():545 -> p
+    49:57:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):695:703 -> p
+    49:57:boolean consistentDefUseChains():669 -> p
+    49:57:boolean isConsistentSSA():545 -> p
+    58:58:boolean isConsistentSSA():546:546 -> p
+    59:75:boolean validThrowingInstructions():825:841 -> p
+    59:75:boolean isConsistentSSA():546 -> p
+    76:76:boolean isConsistentSSA():547:547 -> p
+    77:88:boolean noCriticalEdges():605:616 -> p
+    77:88:boolean isConsistentSSA():547 -> p
+    89:91:boolean isConsistentSSA():547:549 -> p
+    1:1:java.util.ListIterator listIterator():942:942 -> q
+    1:1:com.android.tools.r8.ir.code.IRMetadata metadata():136:136 -> r
+    1:3:com.android.tools.r8.com.google.common.collect.ImmutableList numberInstructions():950:952 -> s
+    1:7:int numberRemainingInstructions():958:964 -> t
+    1:7:java.lang.String toString():442:448 -> toString
+    1:1:void prepareBlocksForCatchHandlers():300:300 -> u
+    2:2:java.util.ListIterator listIterator():942:942 -> u
+    2:2:void prepareBlocksForCatchHandlers():301 -> u
+    3:3:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():27:27 -> u
+    3:3:void prepareBlocksForCatchHandlers():302 -> u
+    4:7:void prepareBlocksForCatchHandlers():303:306 -> u
+    8:8:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():57:57 -> u
+    8:8:void prepareBlocksForCatchHandlers():306 -> u
+    9:9:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> u
+    9:9:void prepareBlocksForCatchHandlers():307 -> u
+    10:11:void prepareBlocksForCatchHandlers():308:309 -> u
+    12:12:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> u
+    12:12:void prepareBlocksForCatchHandlers():311 -> u
+    13:25:void prepareBlocksForCatchHandlers():312:324 -> u
+    26:27:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> u
+    26:27:void prepareBlocksForCatchHandlers():324 -> u
+    28:29:void prepareBlocksForCatchHandlers():325:326 -> u
+    30:30:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> u
+    30:30:void prepareBlocksForCatchHandlers():326 -> u
+    31:35:void prepareBlocksForCatchHandlers():327:331 -> u
+    1:1:void removeAllTrivialPhis():1081:1081 -> v
+    1:3:java.util.Set removeUnreachableBlocks():1200:1202 -> w
+    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1217:1217 -> w
+    4:4:java.util.Set removeUnreachableBlocks():1202 -> w
+    5:5:void com.android.tools.r8.ir.code.BasicBlockIterator.<init>(com.android.tools.r8.ir.code.IRCode):17:17 -> w
+    5:5:java.util.ListIterator listIterator():942 -> w
+    5:5:java.util.Set removeUnreachableBlocks():1203 -> w
+    6:6:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():27:27 -> w
+    6:6:java.util.Set removeUnreachableBlocks():1204 -> w
+    7:7:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.next():32:32 -> w
+    7:7:java.lang.Object com.android.tools.r8.ir.code.BasicBlockIterator.next():9 -> w
+    7:7:java.util.Set removeUnreachableBlocks():1205 -> w
+    8:9:java.util.Set removeUnreachableBlocks():1206:1207 -> w
+    10:11:void com.android.tools.r8.ir.code.BasicBlockIterator.remove():81:82 -> w
+    10:11:java.util.Set removeUnreachableBlocks():1208 -> w
+    12:12:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():57:57 -> w
+    12:12:void com.android.tools.r8.ir.code.BasicBlockIterator.remove():82 -> w
+    12:12:java.util.Set removeUnreachableBlocks():1208 -> w
+    13:13:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> w
+    13:13:void com.android.tools.r8.ir.code.BasicBlockIterator.remove():83 -> w
+    13:13:java.util.Set removeUnreachableBlocks():1208 -> w
+    14:17:void com.android.tools.r8.ir.code.BasicBlockIterator.remove():84:87 -> w
+    14:17:java.util.Set removeUnreachableBlocks():1208 -> w
+    18:19:java.util.Set removeUnreachableBlocks():1211:1212 -> w
+    1:1:int reserveMarkingColor():1102:1102 -> x
+    2:2:boolean anyMarkingColorAvailable():1116:1116 -> x
+    2:2:int reserveMarkingColor():1102 -> x
+    3:11:int reserveMarkingColor():1102:1110 -> x
+    12:13:boolean verifyNoBlocksMarked(int):468:469 -> x
+    12:13:int reserveMarkingColor():1110 -> x
+    1:24:void splitCriticalEdges():335:358 -> y
+    25:34:void splitCriticalEdges():357:366 -> y
+    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList depthFirstSorting():493:516 -> z
+    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():486 -> z
+    25:25:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():487:487 -> z
+    26:37:com.android.tools.r8.com.google.common.collect.ImmutableList reorderExceptionalBlocksLastForTesting(com.android.tools.r8.com.google.common.collect.ImmutableList):522:533 -> z
+    26:37:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():488 -> z
 com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.D.b.h0:
     com.android.tools.r8.ir.code.BasicBlock block -> a
-    1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):86:87 -> <init>
+    1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):89:90 -> <init>
 com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.D.b.i0:
     java.util.Deque liveStackValues -> c
     java.util.Set liveValues -> a
     java.util.Set liveLocalValues -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():49:49 -> <clinit>
-    1:5:void <init>(java.util.Set,java.util.Set,java.util.Deque):59:63 -> <init>
-    1:2:boolean equals(java.lang.Object):73:74 -> equals
-    1:1:int hashCode():68:68 -> hashCode
+    1:1:void <clinit>():52:52 -> <clinit>
+    1:5:void <init>(java.util.Set,java.util.Set,java.util.Deque):62:66 -> <init>
+    1:2:boolean equals(java.lang.Object):76:77 -> equals
+    1:1:int hashCode():71:71 -> hashCode
 com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.D.b.k0:
     java.util.ListIterator blockIterator -> a
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> b
@@ -24841,18 +24920,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 -> B2
     com.android.tools.r8.ir.code.If asIf() -> C
-    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
+    1:4:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():132:135 -> C2
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTrueTarget():117:120 -> D2
+    1:1:com.android.tools.r8.ir.code.If$Type getType():106:106 -> E2
+    1:2:void invert():110:111 -> F2
+    3:4:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):140:141 -> F2
+    3:4:void invert():112 -> F2
+    5:5:void invert():113:113 -> F2
+    1:1:boolean isZeroTest():93:93 -> G2
+    1:1:com.android.tools.r8.ir.code.Value lhs():97:97 -> H2
+    1:2:com.android.tools.r8.ir.code.Value rhs():101:102 -> I2
+    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():214:216 -> J2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:3:boolean verifyTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.If$Type):65:67 -> a
     4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):146:146 -> a
@@ -24883,10 +24962,10 @@
     31:31:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):223:223 -> b
     1:4:void setTrueTarget(com.android.tools.r8.ir.code.BasicBlock):124:127 -> c
     1:8:java.lang.String toString():161:168 -> toString
-    1:1:int maxInValueRegister():174:174 -> v2
-    1:1:int maxOutValueRegister():179:179 -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():174:174 -> w2
+    1:1:int maxOutValueRegister():179:179 -> x2
     boolean isIf() -> y1
+    int opcode() -> y2
 com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.D.b.n0:
     com.android.tools.r8.ir.code.If$Type GT -> c
     com.android.tools.r8.ir.code.If$Type LE -> d
@@ -24921,18 +25000,17 @@
     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() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.D.b.r0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():34:34 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):37:37 -> <init>
-    boolean throwsOnNullInput() -> A2
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():207:207 -> B0
+    boolean throwsOnNullInput() -> B2
     com.android.tools.r8.ir.code.InstanceGet asInstanceGet() -> D
-    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:1:com.android.tools.r8.ir.code.Value value():66:66 -> E2
     1:2:com.android.tools.r8.ir.code.Value object():60:61 -> F2
     boolean instructionTypeCanThrow() -> N0
     1:1:boolean outTypeKnownToBeBoolean(java.util.Set):47:47 -> a
@@ -24964,16 +25042,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() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
     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>
     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
+    1:1:com.android.tools.r8.graph.DexType type():39:39 -> C2
+    1:1:com.android.tools.r8.ir.code.Value value():47:47 -> D2
     com.android.tools.r8.ir.code.InstanceOf asInstanceOf() -> E
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
@@ -24988,19 +25066,19 @@
     8:9:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):105:106 -> a
     10:10:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int maxInValueRegister() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.D.b.t0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():34:34 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):37:39 -> <init>
-    boolean throwsOnNullInput() -> A2
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():219:219 -> B0
     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
+    boolean throwsOnNullInput() -> B2
+    1:1:com.android.tools.r8.ir.code.Value value():58:58 -> E2
     com.android.tools.r8.ir.code.InstancePut asInstancePut() -> F
+    1:1:com.android.tools.r8.ir.code.Value object():53:53 -> F2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):49:49 -> a
     2:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:92 -> a
@@ -25024,9 +25102,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() -> v2
-    1:1:int maxOutValueRegister():170:170 -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():170:170 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.D.b.u0:
     java.util.List inValues -> b
     java.util.Set debugValues -> e
@@ -25045,10 +25123,11 @@
     com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction() -> A
     1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():595:595 -> A0
     boolean isInstanceOf() -> A1
-    boolean throwsOnNullInput() -> A2
+    1:1:com.android.tools.r8.ir.code.Value outValue():120:120 -> A2
     com.android.tools.r8.ir.code.Goto asGoto() -> B
-    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():1361:1361 -> B0
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():1365:1365 -> B0
     boolean isInstancePut() -> B1
+    boolean throwsOnNullInput() -> B2
     com.android.tools.r8.ir.code.If asIf() -> C
     1:1:int getNumber():342:342 -> C0
     boolean isIntSwitch() -> C1
@@ -25107,22 +25186,22 @@
     boolean isMonitor() -> T1
     com.android.tools.r8.ir.code.Load asLoad() -> U
     boolean isArrayLength() -> U0
-    boolean isMove() -> U1
+    boolean isMonitorEnter() -> U1
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> V
     boolean isArrayPut() -> V0
-    boolean isMoveException() -> V1
+    boolean isMove() -> V1
     com.android.tools.r8.ir.code.Monitor asMonitor() -> W
     boolean isAssume() -> W0
-    boolean isMul() -> W1
+    boolean isMoveException() -> W1
     com.android.tools.r8.ir.code.Move asMove() -> X
     boolean isAssumeDynamicType() -> X0
-    boolean isNeg() -> X1
+    boolean isMul() -> X1
     com.android.tools.r8.ir.code.MoveException asMoveException() -> Y
     boolean isAssumeNonNull() -> Y0
-    boolean isNewArrayEmpty() -> Y1
+    boolean isNeg() -> Y1
     com.android.tools.r8.ir.code.Mul asMul() -> Z
     boolean isBinop() -> Z0
-    boolean isNewArrayFilledData() -> Z1
+    boolean isNewArrayEmpty() -> Z1
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void buildCf(com.android.tools.r8.ir.conversion.CfBuilder) -> a
     void buildDex(com.android.tools.r8.ir.conversion.DexBuilder) -> a
@@ -25144,10 +25223,10 @@
     33:33:java.lang.String com.android.tools.r8.utils.CfgPrinter.makeUnusedValue():20:20 -> a
     33:33:void print(com.android.tools.r8.utils.CfgPrinter):318 -> a
     34:37:void print(com.android.tools.r8.utils.CfgPrinter):320:323 -> a
-    38:38:int com.android.tools.r8.ir.code.Value.getNumber():287:287 -> a
+    38:38:int com.android.tools.r8.ir.code.Value.getNumber():291:291 -> a
     38:38:void print(com.android.tools.r8.utils.CfgPrinter):323 -> a
     39:47:void print(com.android.tools.r8.utils.CfgPrinter):323:331 -> a
-    48:48:int com.android.tools.r8.ir.code.Value.getNumber():287:287 -> a
+    48:48:int com.android.tools.r8.ir.code.Value.getNumber():291:291 -> a
     48:48:void print(com.android.tools.r8.utils.CfgPrinter):331 -> a
     49:49:void print(com.android.tools.r8.utils.CfgPrinter):331:331 -> a
     50:51:void setNumber(int):346:347 -> a
@@ -25175,138 +25254,138 @@
     154:170:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):481 -> a
     171:172:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):487:488 -> a
     173:173:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):495:495 -> a
-    174:174:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():794:794 -> a
+    174:174:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():798:798 -> a
     174:174:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):495 -> a
-    175:175:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():794:794 -> a
+    175:175:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():798:798 -> a
     175:175:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):495 -> a
     176:182:boolean identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):499:505 -> a
     183:183:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):539:539 -> a
     184:184:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):546:546 -> a
-    185:186:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):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
+    185:186:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):1301:1302 -> a
+    187:190:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):1308:1311 -> a
+    191:193:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):1316:1318 -> a
+    194:200:boolean verifyValidPositionInfo(boolean):1385:1391 -> a
+    201:201:boolean verifyValidPositionInfo(boolean):1387:1387 -> a
     com.android.tools.r8.ir.code.Neg asNeg() -> a0
     boolean isCheckCast() -> a1
-    boolean isNewInstance() -> a2
+    boolean isNewArrayFilledData() -> a2
     com.android.tools.r8.ir.code.Add asAdd() -> b
     1:4:void addInValue(com.android.tools.r8.ir.code.Value):98:101 -> b
     5:8:void replaceValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):171:174 -> b
     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):528:528 -> b
-    18:29:boolean verifyTypes(com.android.tools.r8.graph.AppView):1319:1330 -> b
+    18:29:boolean verifyTypes(com.android.tools.r8.graph.AppView):1323:1334 -> b
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> b0
     boolean isCmp() -> b1
-    boolean isNot() -> b2
+    boolean isNewInstance() -> b2
     com.android.tools.r8.ir.code.And asAnd() -> c
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     boolean needsValueInRegister(com.android.tools.r8.ir.code.Value) -> c
     1:7:void clearUserInfo(com.android.tools.r8.ir.code.Instruction):152:158 -> c
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> c0
     boolean isConstClass() -> c1
-    boolean isNumberConversion() -> c2
+    boolean isNot() -> c2
     com.android.tools.r8.ir.code.Argument asArgument() -> d
     1:9:void removeDebugValue(com.android.tools.r8.ir.code.Value):218:226 -> d
     10:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):554:558 -> d
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> d0
     boolean isConstInstruction() -> d1
-    boolean isOr() -> d2
+    boolean isNumberConversion() -> d2
     com.android.tools.r8.ir.code.ArithmeticBinop asArithmeticBinop() -> e
     1:4:void setOutValue(com.android.tools.r8.ir.code.Value):124:127 -> e
     com.android.tools.r8.ir.code.Not asNot() -> e0
     boolean isConstMethodHandle() -> e1
-    boolean isOutConstant() -> e2
+    boolean isOr() -> e2
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> f
     1:5:com.android.tools.r8.ir.code.Value swapOutValue(com.android.tools.r8.ir.code.Value):132:136 -> f
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> f0
     boolean isConstMethodType() -> f1
-    boolean isPop() -> f2
+    boolean isOutConstant() -> f2
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> g
     com.android.tools.r8.ir.code.Or asOr() -> g0
     boolean isConstNumber() -> g1
-    boolean isRem() -> g2
+    boolean isPop() -> g2
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> h
     com.android.tools.r8.ir.code.Rem asRem() -> h0
     boolean isConstString() -> h1
-    boolean isReturn() -> h2
+    boolean isRem() -> h2
     com.android.tools.r8.ir.code.Assume asAssume() -> i
     com.android.tools.r8.ir.code.Return asReturn() -> i0
-    1:4:boolean isCreatingArray():1276:1279 -> i1
-    boolean isShl() -> i2
+    1:4:boolean isCreatingArray():1280:1283 -> i1
+    boolean isReturn() -> i2
     com.android.tools.r8.ir.code.Assume asAssumeDynamicType() -> j
     com.android.tools.r8.ir.code.Shl asShl() -> j0
-    1:1:boolean isCreatingInstanceOrArray():1283:1283 -> j1
-    boolean isShr() -> j2
+    1:1:boolean isCreatingInstanceOrArray():1287:1287 -> j1
+    boolean isShl() -> j2
     com.android.tools.r8.ir.code.Assume asAssumeNonNull() -> k
     com.android.tools.r8.ir.code.Shr asShr() -> k0
-    1:5:boolean isDebugInstruction():1080:1084 -> k1
-    boolean isStaticGet() -> k2
+    1:5:boolean isDebugInstruction():1084:1088 -> k1
+    boolean isShr() -> k2
     com.android.tools.r8.ir.code.Binop asBinop() -> l
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> l0
     boolean isDebugLocalRead() -> l1
-    boolean isStaticPut() -> l2
+    boolean isStaticGet() -> l2
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> m
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> m0
     boolean isDebugLocalUninitialized() -> m1
-    boolean isStore() -> m2
+    boolean isStaticPut() -> m2
     com.android.tools.r8.ir.code.Cmp asCmp() -> n
     com.android.tools.r8.ir.code.Store asStore() -> n0
     boolean isDebugLocalWrite() -> n1
-    boolean isStringSwitch() -> n2
+    boolean isStore() -> n2
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> o
     com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> o0
     boolean isDebugLocalsChange() -> o1
-    boolean isSub() -> o2
+    boolean isStringSwitch() -> o2
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> p
     com.android.tools.r8.ir.code.Sub asSub() -> p0
     boolean isDebugPosition() -> p1
-    boolean isSwap() -> p2
+    boolean isSub() -> p2
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> q
     com.android.tools.r8.ir.code.Switch asSwitch() -> q0
     boolean isDexItemBasedConstString() -> q1
-    boolean isSwitch() -> q2
+    boolean isSwap() -> q2
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> r
     com.android.tools.r8.ir.code.Throw asThrow() -> r0
     boolean isDiv() -> r1
-    boolean isThrow() -> r2
+    boolean isSwitch() -> r2
     com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> s
     com.android.tools.r8.ir.code.Ushr asUshr() -> s0
     boolean isDup() -> s1
-    boolean isUnop() -> s2
+    boolean isThrow() -> s2
     com.android.tools.r8.ir.code.ConstString asConstString() -> t
     com.android.tools.r8.ir.code.Xor asXor() -> t0
     boolean isDup2() -> t1
-    boolean isUshr() -> t2
+    boolean isUnop() -> t2
     1:14:java.lang.String toString():298:311 -> toString
     com.android.tools.r8.ir.code.DebugLocalWrite asDebugLocalWrite() -> u
     1:2:void clearBlock():273:274 -> u0
     1:1:boolean isFieldGet():856:856 -> u1
-    boolean isXor() -> u2
+    boolean isUshr() -> u2
     com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> v
     1:5:void clearDebugValues():245:249 -> v0
     boolean isFieldInstruction() -> v1
-    int maxInValueRegister() -> v2
+    boolean isXor() -> v2
     com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> w
-    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():1271:1271 -> w0
+    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():1275:1275 -> w0
     1:1:boolean isFieldPut():860:860 -> w1
-    int maxOutValueRegister() -> w2
+    int maxInValueRegister() -> w2
     com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> x
     1:2:com.android.tools.r8.ir.code.BasicBlock getBlock():257:258 -> x0
     boolean isGoto() -> x1
-    int opcode() -> x2
+    int maxOutValueRegister() -> x2
     com.android.tools.r8.ir.code.Div asDiv() -> y
     1:1:java.util.Set getDebugValues():599:599 -> y0
     boolean isIf() -> y1
-    1:1:com.android.tools.r8.ir.code.ValueType outType():163:163 -> y2
+    int opcode() -> y2
     com.android.tools.r8.ir.code.Dup asDup() -> z
     1:1:java.lang.String getInstructionName():293:293 -> z0
     boolean isInstanceGet() -> z1
-    1:1:com.android.tools.r8.ir.code.Value outValue():120:120 -> z2
+    1:1:com.android.tools.r8.ir.code.ValueType outType():163:163 -> z2
 com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.D.b.v0:
-    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
+    1:3:java.lang.Object com.android.tools.r8.ir.code.NextUntilIterator.nextUntil(java.util.function.Predicate):0 -> a
     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
     1:1:void remove():15:15 -> remove
@@ -25315,10 +25394,6 @@
     void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction) -> a
     com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator) -> a
     com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator) -> a
-    1:3:java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate):18:20 -> a
-    4:4:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode):99:99 -> a
-    5:5:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int):126:126 -> a
-    java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate) -> b
     void removeOrReplaceByDebugLocalRead() -> d
 com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.D.b.x0:
 com.android.tools.r8.ir.code.IntSwitch -> com.android.tools.r8.D.b.y0:
@@ -25327,14 +25402,14 @@
     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() -> C1
-    1:7:boolean valid():55:61 -> F2
     com.android.tools.r8.ir.code.IntSwitch asIntSwitch() -> G
-    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
+    1:7:boolean valid():55:61 -> G2
+    1:1:int getFirstKey():177:177 -> I2
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():214:215 -> J2
+    3:3:int getKey(int):206:206 -> J2
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216 -> J2
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216:216 -> J2
+    1:1:int[] getKeys():210:210 -> K2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> a
     1:1:void forEachCase(com.android.tools.r8.utils.IntObjConsumer):48:48 -> a
@@ -25384,34 +25459,34 @@
     5:5:int getKey(int):206:206 -> toString
     5:5:java.lang.String toString():268 -> toString
     6:11:java.lang.String toString():268:273 -> toString
-    int maxInValueRegister() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.D.b.A0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):61:61 -> <init>
-    1:1:java.util.List arguments():103:103 -> B2
-    com.android.tools.r8.graph.DexType getReturnType() -> C2
-    com.android.tools.r8.ir.code.Invoke$Type getType() -> D2
+    1:1:java.util.List arguments():103:103 -> C2
+    com.android.tools.r8.graph.DexType getReturnType() -> 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$Type getType() -> E2
+    java.lang.String getTypeString() -> F2
+    1:1:int requiredArgumentRegisters():108:108 -> G2
+    2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> G2
+    2:2:int requiredArgumentRegisters():109 -> G2
     com.android.tools.r8.ir.code.Invoke asInvoke() -> H
+    1:1:java.util.List arguments():103:103 -> H2
+    1:1:boolean argumentsAreConsecutiveInputArguments():222 -> H2
+    2:2:boolean argumentsAreConsecutiveInputArguments():222:222 -> H2
+    3:3:java.util.List arguments():103:103 -> H2
+    3:3:boolean argumentsAreConsecutiveInputArguments():225 -> H2
+    4:5:boolean argumentsAreConsecutiveInputArguments():225:226 -> H2
+    6:6:java.util.List arguments():103:103 -> H2
+    6:6:boolean argumentsAreConsecutiveInputArguments():229 -> H2
+    7:7:boolean argumentsAreConsecutiveInputArguments():229:229 -> H2
+    8:8:java.util.List arguments():103:103 -> H2
+    8:8:boolean argumentsAreConsecutiveInputArguments():230 -> H2
+    9:10:boolean argumentsAreConsecutiveInputArguments():230:231 -> H2
     boolean instructionTypeCanThrow() -> N0
     1:21:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):71:91 -> a
     22:22:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):89:89 -> a
@@ -25433,13 +25508,13 @@
     44:44:java.util.List arguments():103:103 -> a
     44:44:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):130 -> a
     45:54:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):130:139 -> a
-    55:55:int com.android.tools.r8.ir.code.Value.requiredRegisters():291:291 -> a
+    55:55:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> a
     55:55:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):140 -> a
     56:58:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):141:143 -> a
-    59:59:int com.android.tools.r8.ir.code.Value.requiredRegisters():291:291 -> a
+    59:59:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> a
     59:59:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):143 -> a
     60:60:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):143:143 -> a
-    61:61:int com.android.tools.r8.ir.code.Value.requiredRegisters():291:291 -> a
+    61:61:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> a
     61:61:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):144 -> a
     62:63:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):145:146 -> a
     64:77:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):165:178 -> a
@@ -25457,7 +25532,7 @@
     1:1:java.util.List arguments():103:103 -> b
     1:1:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):153 -> b
     2:3:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):153:154 -> b
-    4:4:int com.android.tools.r8.ir.code.Value.requiredRegisters():291:291 -> b
+    4:4:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> b
     4:4:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):154 -> b
     5:5:java.util.List arguments():103:103 -> b
     5:5:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):155 -> b
@@ -25465,7 +25540,7 @@
     7:7:java.util.List arguments():103:103 -> b
     7:7:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):156 -> b
     8:9:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):156:157 -> b
-    10:10:int com.android.tools.r8.ir.code.Value.requiredRegisters():291:291 -> b
+    10:10:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> b
     10:10:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):158 -> b
     1:1:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):240:240 -> c
     2:2:java.util.List arguments():103:103 -> c
@@ -25474,10 +25549,10 @@
     11:11:java.util.List arguments():103:103 -> c
     11:11:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):255 -> c
     12:13:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):255:256 -> c
-    1:1:java.util.List arguments():103:103 -> v2
-    1:1:int maxInValueRegister():213 -> v2
-    2:4:int maxInValueRegister():213:215 -> v2
-    int maxOutValueRegister() -> w2
+    1:1:java.util.List arguments():103:103 -> w2
+    1:1:int maxInValueRegister():213 -> w2
+    2:4:int maxInValueRegister():213:215 -> w2
+    int maxOutValueRegister() -> x2
     1:1:java.lang.String getInstructionName():269:269 -> z0
 com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.D.b.z0:
     com.android.tools.r8.ir.code.Invoke$Type NEW_ARRAY -> f
@@ -25505,11 +25580,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 -> C2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():110:110 -> D2
-    java.lang.String getTypeString() -> E2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():101:101 -> D2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():110:110 -> E2
     boolean isInvokeCustom() -> F1
-    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> G2
+    java.lang.String getTypeString() -> F2
+    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> H2
     com.android.tools.r8.ir.code.InvokeCustom asInvokeCustom() -> I
     boolean hasInvariantOutType() -> I0
     1:29:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):66:94 -> a
@@ -25549,17 +25624,17 @@
     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() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.D.b.C0:
     boolean $assertionsDisabled -> m
     boolean itf -> l
     1:1:void <clinit>():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 -> D2
-    java.lang.String getTypeString() -> E2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():67:67 -> E2
+    java.lang.String getTypeString() -> F2
     boolean isInvokeDirect() -> G1
-    1:1:boolean isInterface():57:57 -> I2
     com.android.tools.r8.ir.code.InvokeDirect asInvokeDirect() -> J
+    1:1:boolean isInterface():57:57 -> J2
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:96 -> a
     20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):113:113 -> a
     21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):159:159 -> a
@@ -25568,10 +25643,10 @@
     24:24:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeDirect):184:184 -> a
     24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):62 -> a
     25:66:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):236:277 -> a
-    67:67:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    67:67:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     67:67:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):277 -> a
     68:68:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):277:277 -> a
-    69:69:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    69:69:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     69:69:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):277 -> a
     70:70:boolean lambda$canBeDeadCode$0(java.util.List,com.android.tools.r8.ir.code.Instruction):271:271 -> a
     1:11:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):180:190 -> b
@@ -25581,13 +25656,13 @@
     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() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.D.b.D0:
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():26:26 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):29:29 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():44:44 -> D2
-    java.lang.String getTypeString() -> E2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():44:44 -> E2
+    java.lang.String getTypeString() -> F2
     boolean isInvokeInterface() -> H1
     com.android.tools.r8.ir.code.InvokeInterface asInvokeInterface() -> K
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:73 -> a
@@ -25600,67 +25675,67 @@
     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
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.D.b.E0:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexMethod method -> i
-    1:1:void <clinit>():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
+    1:1:void <clinit>():24:24 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):29:30 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getReturnType():35:35 -> D2
+    1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():39:39 -> H2
     boolean hasInvariantOutType() -> I0
     boolean isInvokeMethod() -> I1
     com.android.tools.r8.ir.code.InvokeMethod asInvokeMethod() -> L
-    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.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
+    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):44:44 -> a
+    2:2:com.android.tools.r8.graph.DexMethod getInvokedMethod():39:39 -> a
+    2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):44 -> a
+    3:8:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):79:84 -> a
     9:9:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    9:9:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):88 -> a
-    10:10:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):88:88 -> a
+    9:9:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):89 -> a
+    10:10:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):89:89 -> a
     11:11:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    11:11:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):89 -> a
-    12:13:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):89:90 -> a
+    11:11:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):90 -> a
+    12:13:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):90:91 -> a
     14:14:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    14:14:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):90 -> a
-    15:15:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):90:90 -> a
+    14:14:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):91 -> a
+    15:15:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):91:91 -> a
     16:16:boolean com.android.tools.r8.utils.InternalOptions.canHaveIncorrectJoinForArrayOfInterfacesBug():0:0 -> a
-    16:16:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):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
+    16:16:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):83 -> a
+    17:25:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):102:110 -> a
+    26:26:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):121:121 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):130:130 -> d
+    1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):131:131 -> d
     com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> e
     java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> f
-    1:1:java.lang.String toString():48:48 -> toString
+    1:1:java.lang.String toString():49:49 -> toString
 com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.D.b.F0:
     boolean $assertionsDisabled -> k
-    1:1:void <clinit>():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
+    1:1:void <clinit>():22:22 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):25:25 -> <init>
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():66:66 -> B0
+    boolean throwsOnNullInput() -> B2
+    1:2:com.android.tools.r8.ir.code.Value getReceiver():39:40 -> I2
     boolean isInvokeMethodWithReceiver() -> J1
     com.android.tools.r8.ir.code.InvokeMethodWithReceiver asInvokeMethodWithReceiver() -> M
-    1:1:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.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
+    1:1:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):50:50 -> a
+    2:2:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):56:56 -> a
+    1:15:boolean verifyTypes(com.android.tools.r8.graph.AppView):71:85 -> b
+    16:16:boolean verifyTypes(com.android.tools.r8.graph.AppView):84:84 -> b
 com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.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 -> 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
+    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> D2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():65 -> D2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():56:56 -> E2
+    java.lang.String getTypeString() -> F2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> H2
     boolean hasInvariantOutType() -> I0
+    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> I2
+    1:1:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159 -> I2
+    2:13:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159:170 -> I2
     boolean isInvokeMultiNewArray() -> K1
     com.android.tools.r8.ir.code.InvokeMultiNewArray asInvokeMultiNewArray() -> N
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:75 -> a
@@ -25687,19 +25762,19 @@
     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() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.D.b.H0:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():25:25 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,java.util.List):30:31 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> 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
+    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> D2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():46 -> D2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():55:55 -> E2
+    java.lang.String getTypeString() -> F2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> H2
     boolean hasInvariantOutType() -> I0
+    1:1:com.android.tools.r8.errors.Unreachable cfUnsupported():139:139 -> I2
     boolean isInvokeNewArray() -> L1
     com.android.tools.r8.ir.code.InvokeNewArray asInvokeNewArray() -> O
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:89 -> a
@@ -25724,69 +25799,69 @@
     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() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.D.b.I0:
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexProto proto -> k
-    1:1:void <clinit>():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
+    1:1:void <clinit>():28:28 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):33:34 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getReturnType():49:49 -> D2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():54:54 -> E2
+    java.lang.String getTypeString() -> F2
+    1:1:com.android.tools.r8.graph.DexProto getProto():63:63 -> I2
     boolean isInvokePolymorphic() -> M1
     com.android.tools.r8.ir.code.InvokePolymorphic asInvokePolymorphic() -> P
-    1:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):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
+    1:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):69:75 -> a
+    8:8:com.android.tools.r8.graph.DexProto getProto():63:63 -> a
+    8:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75 -> a
+    9:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:81 -> a
+    16:16:com.android.tools.r8.graph.DexProto getProto():63:63 -> a
+    16:16:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82 -> a
+    17:24:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:89 -> a
+    25:31:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):94:100 -> a
+    32:32:com.android.tools.r8.graph.DexProto getProto():63:63 -> a
+    32:32:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):100 -> a
+    33:34:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):100:101 -> a
+    35:37:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):106:108 -> a
+    38:40:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):149:151 -> 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
+    41:41:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):137 -> 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
+    42:42:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):44 -> a
     com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> e
     java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> f
-    int opcode() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.D.b.J0:
     boolean itf -> k
     boolean $assertionsDisabled -> l
-    1:1:void <clinit>():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
+    1:1:void <clinit>():33:33 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:39 -> <init>
+    3:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):43:44 -> <init>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():59:59 -> E2
+    java.lang.String getTypeString() -> F2
     boolean isInvokeStatic() -> N1
     com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic() -> Q
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):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
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:88 -> a
+    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):93:93 -> a
+    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):139:139 -> a
+    22:22:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):149:149 -> a
+    23:23:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):155:155 -> a
+    24:24:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):165:165 -> a
     25:25:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeStatic):209:209 -> a
-    25:25:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):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
+    25:25:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):54 -> a
+    26:26:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):212:212 -> a
+    27:27:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):223:223 -> a
+    1:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):171:208 -> b
+    1:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):108:123 -> e
+    1:2:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):132:133 -> f
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.D.b.K0:
     boolean $assertionsDisabled -> m
     boolean itf -> l
     1:1:void <clinit>():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 -> D2
-    java.lang.String getTypeString() -> E2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():46:46 -> E2
+    java.lang.String getTypeString() -> F2
     boolean isInvokeSuper() -> O1
     com.android.tools.r8.ir.code.InvokeSuper asInvokeSuper() -> R
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:75 -> a
@@ -25798,13 +25873,13 @@
     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() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.D.b.L0:
     boolean $assertionsDisabled -> l
     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
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():47:47 -> E2
+    java.lang.String getTypeString() -> F2
     boolean isInvokeVirtual() -> P1
     com.android.tools.r8.ir.code.InvokeVirtual asInvokeVirtual() -> S
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:76 -> a
@@ -25822,14 +25897,14 @@
     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
+    int opcode() -> y2
 com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.D.b.M0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.code.Value):19:19 -> <init>
     3:3:void <init>(java.util.List):23:23 -> <init>
-    com.android.tools.r8.ir.code.BasicBlock fallthroughBlock() -> B2
+    com.android.tools.r8.ir.code.BasicBlock fallthroughBlock() -> C2
     boolean hasInvariantOutType() -> I0
     boolean isJumpInstruction() -> Q1
     com.android.tools.r8.ir.code.JumpInstruction asJumpInstruction() -> T
@@ -25869,7 +25944,7 @@
     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 -> B2
+    1:1:com.android.tools.r8.ir.code.Value src():36:36 -> C2
     boolean hasInvariantOutType() -> I0
     boolean isLoad() -> R1
     com.android.tools.r8.ir.code.Load asLoad() -> U
@@ -25883,14 +25958,14 @@
     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() -> v2
-    1:1:int maxOutValueRegister():61:61 -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():61:61 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.D.b.P0:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):20:20 -> <init>
-    com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> G2
+    com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> H2
     boolean isLogicalBinop() -> S1
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> V
     com.android.tools.r8.code.Instruction CreateInt(int,int,int) -> a
@@ -25937,27 +26012,29 @@
     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>
-    boolean throwsOnNullInput() -> A2
-    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():151:151 -> B0
-    1:1:boolean isEnter():50:50 -> B2
-    1:1:com.android.tools.r8.ir.code.Value object():46:46 -> C2
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():156:156 -> B0
+    boolean throwsOnNullInput() -> B2
+    1:1:boolean isEnter():50:50 -> C2
+    1:1:com.android.tools.r8.ir.code.Value object():46:46 -> D2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     boolean isMonitor() -> T1
+    1:1:boolean isEnter():50:50 -> U1
+    1:1:boolean isMonitorEnter():103 -> U1
     com.android.tools.r8.ir.code.Monitor asMonitor() -> W
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:71 -> a
     9:9:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):77:77 -> a
-    10:10:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):131:131 -> a
-    11:11:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):136:136 -> a
-    12:12:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):141:141 -> a
-    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
+    10:10:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):136:136 -> a
+    11:11:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):141:141 -> a
+    12:12:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):146:146 -> a
+    13:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():211:211 -> a
+    13:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):114 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int maxInValueRegister() -> v2
-    1:1:int maxOutValueRegister():87:87 -> w2
-    int opcode() -> x2
-    1:7:java.lang.String getInstructionName():114:120 -> z0
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():87:87 -> x2
+    int opcode() -> y2
+    1:7:java.lang.String getInstructionName():119:125 -> z0
 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
@@ -25969,11 +26046,11 @@
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):23:23 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value dest():37:37 -> B2
-    1:1:com.android.tools.r8.ir.code.Value src():41:41 -> C2
+    1:1:com.android.tools.r8.ir.code.Value dest():37:37 -> C2
     1:2:com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction():86:87 -> D0
+    1:1:com.android.tools.r8.ir.code.Value src():41:41 -> D2
     boolean hasInvariantOutType() -> I0
-    boolean isMove() -> U1
+    boolean isMove() -> V1
     com.android.tools.r8.ir.code.Move asMove() -> X
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):46:46 -> a
@@ -25982,26 +26059,26 @@
     4:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71:71 -> a
     5:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):108:108 -> a
     6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):118:118 -> a
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMove():216:216 -> a
+    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMove():215:215 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):103 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:boolean isOutConstant():81:81 -> e2
+    1:1:boolean isOutConstant():81:81 -> f2
     1:1:java.lang.String toString():76:76 -> toString
     2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> toString
     2:2:java.lang.String toString():76 -> toString
     3:3:java.lang.String toString():76:76 -> toString
-    int maxInValueRegister() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.D.b.U0:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexType exceptionType -> h
     com.android.tools.r8.utils.InternalOptions options -> i
     1:1:void <clinit>():19:19 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):24:26 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getExceptionType():119:119 -> B2
+    1:1:com.android.tools.r8.graph.DexType getExceptionType():119:119 -> C2
     boolean hasInvariantOutType() -> I0
-    boolean isMoveException() -> V1
+    boolean isMoveException() -> W1
     com.android.tools.r8.ir.code.MoveException asMoveException() -> Y
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void buildCf(com.android.tools.r8.ir.conversion.CfBuilder) -> a
@@ -26009,7 +26086,7 @@
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45 -> a
     2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45:46 -> a
     4:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):62:65 -> a
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1391:1391 -> a
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1393:1393 -> a
     8:8:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):65 -> a
     9:9:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):66:66 -> a
     10:11:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):83:84 -> a
@@ -26018,17 +26095,17 @@
     14:14:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):115:115 -> a
     15:15: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
     15:15:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):115 -> a
-    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 com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():219:219 -> a
     16:16:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):90 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:int maxInValueRegister():51:51 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():51:51 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.D.b.V0:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> G2
-    boolean isMul() -> W1
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> H2
+    boolean isMul() -> X1
     com.android.tools.r8.ir.code.Mul asMul() -> Z
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -26046,13 +26123,13 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):79:79 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):94:94 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> f
-    int opcode() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.D.b.W0:
     com.android.tools.r8.ir.code.NumericType type -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):26:27 -> <init>
-    boolean isNeg() -> X1
+    boolean isNeg() -> Y1
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Unop.dest():21:21 -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55 -> a
@@ -26065,17 +26142,17 @@
     38:56:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):88:106 -> a
     57:57:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
     com.android.tools.r8.ir.code.Neg asNeg() -> a0
-    int opcode() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.D.b.X0:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexType type -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):25:26 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value size():49:49 -> B2
+    1:1:com.android.tools.r8.ir.code.Value size():49:49 -> C2
     boolean hasInvariantOutType() -> I0
     1:4:boolean instructionInstanceCanThrow():77:80 -> M0
     boolean instructionTypeCanThrow() -> N0
-    boolean isNewArrayEmpty() -> Y1
+    boolean isNewArrayEmpty() -> Z1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:54 -> a
     3:3:com.android.tools.r8.ir.code.Value dest():45:45 -> a
@@ -26096,9 +26173,9 @@
     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() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.D.b.Y0:
     long size -> i
     short[] data -> j
@@ -26106,10 +26183,9 @@
     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 -> B2
+    1:1:com.android.tools.r8.ir.code.Value src():47:47 -> C2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
-    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
@@ -26120,14 +26196,15 @@
     17:17:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):124 -> a
     18:21:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):125:128 -> a
     22:22:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):153:153 -> a
-    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forNewArrayFilledData():228:228 -> a
+    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forNewArrayFilledData():227:227 -> a
     23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):105 -> a
+    boolean isNewArrayFilledData() -> a2
     1:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):134:141 -> b
     boolean 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() -> v2
-    1:1:int maxOutValueRegister():83:83 -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():83:83 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.D.b.Z0:
     boolean allowSpilling -> i
     boolean $assertionsDisabled -> j
@@ -26135,9 +26212,9 @@
     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 -> B2
-    1:1:boolean isSpillingAllowed():184:184 -> C2
-    1:1:void markNoSpilling():180:180 -> D2
+    1:1:com.android.tools.r8.ir.code.Value dest():47:47 -> C2
+    1:1:boolean isSpillingAllowed():184:184 -> D2
+    1:1:void markNoSpilling():180:180 -> E2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):43:43 -> a
@@ -26155,7 +26232,6 @@
     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
@@ -26166,12 +26242,13 @@
     11:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):137:164 -> b
     39:39:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):142:142 -> b
     40:40:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):195:195 -> b
+    boolean isNewInstance() -> b2
     1:11:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):189:199 -> c
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> d0
     1:1:java.lang.String toString():58:58 -> toString
-    1:1:int maxInValueRegister():68:68 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():68:68 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Not -> com.android.tools.r8.D.b.a1:
     com.android.tools.r8.ir.code.NumericType type -> h
     boolean $assertionsDisabled -> i
@@ -26187,9 +26264,9 @@
     38:38:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83:83 -> a
     39:39:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):99:99 -> a
     40:40:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):105:105 -> a
-    boolean isNot() -> b2
+    boolean isNot() -> c2
     com.android.tools.r8.ir.code.Not asNot() -> e0
-    int opcode() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.D.b.b1:
     com.android.tools.r8.ir.code.NumericType to -> i
     com.android.tools.r8.ir.code.NumericType from -> h
@@ -26218,9 +26295,9 @@
     219:219:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):157:157 -> a
     220:220:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):162:162 -> a
     221:221:boolean outTypeKnownToBeBoolean(java.util.Set):167:167 -> a
-    boolean isNumberConversion() -> c2
+    boolean isNumberConversion() -> d2
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> f0
-    int opcode() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.D.b.c1:
     com.android.tools.r8.ir.code.NumericType DOUBLE -> g
     com.android.tools.r8.ir.code.NumericType FLOAT -> f
@@ -26249,8 +26326,8 @@
     60:60:boolean isWide():62:62 -> a
 com.android.tools.r8.ir.code.Or -> com.android.tools.r8.D.b.d1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> G2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -26262,9 +26339,9 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):63:63 -> c
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):68:68 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
-    boolean isOr() -> d2
+    boolean isOr() -> e2
     com.android.tools.r8.ir.code.Or asOr() -> g0
-    int opcode() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.D.b.f1:
     com.android.tools.r8.ir.code.Phi$RegisterReadType readType -> t
     java.util.List definitionUsers -> v
@@ -26324,7 +26401,7 @@
     127:127:void addDefinitionsUser(java.util.Map):327:327 -> a
     128:131:void lambda$verifyIsStackPhi$0(java.util.Set,com.android.tools.r8.ir.code.Value):357:360 -> a
     132:132:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):376:376 -> a
-    133:133:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():794:794 -> a
+    133:133:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():798:798 -> a
     133:133:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):376 -> a
     134:142:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):376:384 -> a
     1:3:void abortOnInvalidDebugInfo(com.android.tools.r8.ir.code.ValueTypeConstraint):83:85 -> b
@@ -26343,7 +26420,7 @@
     1:1:java.util.List getOperands():171:171 -> d0
     1:1:boolean isTrivialPhi():212:212 -> e0
     1:9:java.lang.String printPhi():302:310 -> f0
-    10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():1186:1186 -> f0
+    10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():1199:1199 -> f0
     10:10:java.lang.String printPhi():310 -> f0
     11:12:java.lang.String printPhi():310:311 -> f0
     1:1:void removeDeadPhi():292:292 -> g0
@@ -26371,14 +26448,14 @@
     4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):80 -> a
     5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):80:80 -> a
     6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):85:85 -> a
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forPop():240:240 -> a
+    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forPop():239:239 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):70 -> a
     1: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() -> f2
-    1:1:int maxInValueRegister():59:59 -> v2
-    1:1:int maxOutValueRegister():64:64 -> w2
-    int opcode() -> x2
+    boolean isPop() -> g2
+    1:1:int maxInValueRegister():59:59 -> w2
+    1:1:int maxOutValueRegister():64:64 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Position -> com.android.tools.r8.D.b.h1:
     com.android.tools.r8.ir.code.Position NO_POSITION_SYNTHETIC -> g
     com.android.tools.r8.graph.DexString file -> b
@@ -26405,8 +26482,8 @@
     1:19:java.lang.String toString():151 -> toString
 com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.D.b.i1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> G2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> H2
     1:1:boolean instructionTypeCanThrow():134:134 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -26425,17 +26502,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() -> g2
     com.android.tools.r8.ir.code.Rem asRem() -> h0
-    int opcode() -> x2
+    boolean isRem() -> h2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Return -> com.android.tools.r8.D.b.j1:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():24:24 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.code.Value):28:28 -> <init>
-    1:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getReturnType():46:47 -> C2
-    1:1:boolean isReturnVoid():42:42 -> D2
-    1:2:com.android.tools.r8.ir.code.Value returnValue():51:52 -> E2
+    1:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getReturnType():46:47 -> D2
+    1:1:boolean isReturnVoid():42:42 -> E2
+    1:2:com.android.tools.r8.ir.code.Value returnValue():51:52 -> F2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
     2:9:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80:87 -> a
@@ -26444,18 +26521,18 @@
     13:14:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):119:120 -> a
     15:17:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):127:129 -> a
     18:18:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):126:126 -> a
-    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 com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():243:243 -> 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() -> h2
     com.android.tools.r8.ir.code.Return asReturn() -> i0
-    int maxInValueRegister() -> v2
-    1:1:int maxOutValueRegister():97:97 -> w2
-    int opcode() -> x2
+    boolean isReturn() -> i2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():97:97 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.D.b.k1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> G2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -26467,13 +26544,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() -> i2
     com.android.tools.r8.ir.code.Shl asShl() -> j0
-    int opcode() -> x2
+    boolean isShl() -> j2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.D.b.l1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> G2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -26485,9 +26562,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() -> j2
     com.android.tools.r8.ir.code.Shr asShr() -> k0
-    int opcode() -> x2
+    boolean isShr() -> k2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.D.b.m1:
     int decodedValue() -> a
 com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.D.b.n1:
@@ -26503,7 +26580,7 @@
     4:4:com.android.tools.r8.ir.code.StackValue create(com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo,int,com.android.tools.r8.graph.AppView):26 -> a
     5:5:com.android.tools.r8.ir.code.StackValue create(com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo,int,com.android.tools.r8.graph.AppView):26:26 -> a
     6:6:com.android.tools.r8.ir.code.StackValue duplicate(int):39:39 -> a
-    7:7:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():1186:1186 -> a
+    7:7:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():1199:1199 -> a
     7:7:com.android.tools.r8.ir.code.StackValue duplicate(int):39 -> a
     8:8:com.android.tools.r8.ir.code.StackValue duplicate(int):39:39 -> a
     9:9:void setNeedsRegister(boolean):54:54 -> a
@@ -26525,8 +26602,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 -> D2
-    1:1:com.android.tools.r8.ir.code.Value dest():49:49 -> E2
+    1:1:com.android.tools.r8.ir.code.Value value():54:54 -> E2
+    1:1:com.android.tools.r8.ir.code.Value dest():49:49 -> F2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):45:45 -> a
     2:2:com.android.tools.r8.ir.code.Value dest():49:49 -> a
@@ -26557,17 +26634,17 @@
     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() -> k2
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> l0
+    boolean isStaticGet() -> l2
     1:1:java.lang.String toString():160:160 -> toString
-    int maxInValueRegister() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.D.b.q1:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():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
+    1:2:com.android.tools.r8.ir.code.Value value():54:55 -> E2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):49:49 -> a
     2:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):61:88 -> a
@@ -26593,28 +26670,28 @@
     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:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     35:35:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):145 -> b
     35:35:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
     36:53:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):146:163 -> b
     36:53:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
     54:54:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):162:162 -> b
     54:54:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
-    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     55:55:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):145 -> b
     55:55:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
     1:5:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):269:273 -> c
-    boolean isStaticPut() -> l2
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> m0
+    boolean isStaticPut() -> m2
     1:1:java.lang.String toString():231:231 -> toString
-    int maxInValueRegister() -> v2
-    1:1:int maxOutValueRegister():190:190 -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():190:190 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Store -> com.android.tools.r8.D.b.r1:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.StackValue):23:23 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value src():37:37 -> B2
+    1:1:com.android.tools.r8.ir.code.Value src():37:37 -> C2
     boolean hasInvariantOutType() -> I0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):52:52 -> a
@@ -26627,21 +26704,21 @@
     7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):88:88 -> a
     8:8:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):93:93 -> a
     9:9:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):103:103 -> a
-    10:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStore():260:260 -> a
+    10:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStore():259:259 -> a
     10:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):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() -> m2
     com.android.tools.r8.ir.code.Store asStore() -> n0
-    1:1:int maxInValueRegister():57:57 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    boolean isStore() -> n2
+    1:1:int maxInValueRegister():57:57 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.D.b.s1:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexString[] keys -> l
     1:1:void <clinit>():15:15 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexString[],int[],int):21:23 -> <init>
-    1:4:boolean valid():44:47 -> F2
+    1:4:boolean valid():44:47 -> G2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:void forEachCase(java.util.function.BiConsumer):37:37 -> a
     2:2:com.android.tools.r8.graph.DexString getKey(int):62:62 -> a
@@ -26651,22 +26728,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() -> n2
     com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> o0
+    boolean isStringSwitch() -> o2
     1:4:java.lang.String toString():67:70 -> toString
     5:5:com.android.tools.r8.graph.DexString getKey(int):62:62 -> toString
     5:5:java.lang.String toString():71 -> toString
     6:11:java.lang.String toString():71:76 -> toString
-    1:1:int maxInValueRegister():101:101 -> v2
-    1:1:int maxOutValueRegister():106:106 -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():101:101 -> w2
+    1:1:int maxOutValueRegister():106:106 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.D.b.t1:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):27:27 -> <init>
-    boolean isCommutative() -> C2
-    1:8:int maxInOutValueRegisterSize():131:138 -> E2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> G2
+    boolean isCommutative() -> D2
+    1:8:int maxInOutValueRegisterSize():131:138 -> F2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
@@ -26690,9 +26767,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() -> o2
     com.android.tools.r8.ir.code.Sub asSub() -> p0
-    int opcode() -> x2
+    boolean isSub() -> p2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.D.b.u1:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():19:19 -> <clinit>
@@ -26704,33 +26781,33 @@
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:67 -> a
     2:2:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):72:72 -> a
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):77:77 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forSwap():264:264 -> a
+    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forSwap():263:263 -> 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):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() -> p2
-    int maxInValueRegister() -> v2
-    1:1:int maxOutValueRegister():87:87 -> w2
-    int opcode() -> x2
+    boolean isSwap() -> q2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():87:87 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.D.b.v1:
     int[] targetBlockIndices -> i
     int fallthroughBlockIndex -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():9:9 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,int[],int):15:17 -> <init>
-    1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():51:51 -> 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:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():51:51 -> C2
+    1:1:int getFallthroughBlockIndex():55:55 -> D2
+    1:1:int numberOfKeys():68:68 -> E2
+    1:1:int[] targetBlockIndices():40:40 -> F2
+    1:1:int numberOfKeys():68:68 -> G2
+    1:1:boolean valid():25 -> G2
+    2:2:boolean valid():26:26 -> G2
+    3:3:int getTargetBlockIndex(int):36:36 -> G2
+    3:3:boolean valid():26 -> G2
+    4:4:int getFallthroughBlockIndex():55:55 -> G2
+    4:4:boolean valid():26 -> G2
+    5:5:boolean valid():26:26 -> G2
+    1:1:com.android.tools.r8.ir.code.Value value():21:21 -> H2
     1:1:int getTargetBlockIndex(int):36:36 -> b
     2:2:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):64:64 -> b
     1:1:void setFallthroughBlockIndex(int):59:59 -> c
@@ -26739,12 +26816,12 @@
     2:2:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):32 -> d
     3:3:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):32:32 -> d
     com.android.tools.r8.ir.code.Switch asSwitch() -> q0
-    boolean isSwitch() -> q2
+    boolean isSwitch() -> r2
 com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.D.b.w1:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value exception():34:34 -> C2
+    1:1:com.android.tools.r8.ir.code.Value exception():34:34 -> D2
     boolean instructionTypeCanThrow() -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):39:39 -> a
@@ -26755,34 +26832,34 @@
     10:10:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
     10:10:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):99 -> a
     11:11:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104:104 -> a
-    12:12:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    12:12:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     12:12:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104 -> a
     13:16:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):105:108 -> a
-    17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     17:17:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104 -> a
-    18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forThrow():268:268 -> a
+    18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forThrow():267:267 -> a
     18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):76 -> a
     com.android.tools.r8.ir.code.Throw asThrow() -> r0
-    boolean isThrow() -> r2
-    int maxInValueRegister() -> v2
-    1:1:int maxOutValueRegister():49:49 -> w2
-    int opcode() -> x2
+    boolean isThrow() -> s2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():49:49 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.D.b.x1:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value source():25:25 -> B2
+    1:1:com.android.tools.r8.ir.code.Value source():25:25 -> C2
     boolean hasInvariantOutType() -> I0
     1:2:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):56:57 -> a
     3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):62:62 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():272:272 -> a
+    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():271:271 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):51 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isUnop() -> s2
-    int maxInValueRegister() -> v2
-    int maxOutValueRegister() -> w2
+    boolean isUnop() -> t2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
 com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.D.b.y1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> G2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -26795,8 +26872,8 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):58:58 -> d
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
     com.android.tools.r8.ir.code.Ushr asUshr() -> s0
-    boolean isUshr() -> t2
-    int opcode() -> x2
+    boolean isUshr() -> u2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Value -> com.android.tools.r8.D.b.B1:
     int needsRegister -> j
     boolean isThis -> k
@@ -26818,37 +26895,37 @@
     1:165:void <clinit>():40:204 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):223:223 -> <init>
     2:20:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):208:226 -> <init>
-    1:1:boolean isConstClass():823:823 -> A
-    1:1:boolean isConstNumber():803:803 -> B
-    1:1:boolean isConstString():807:807 -> C
-    1:1:boolean isConstant():827:827 -> D
-    1:1:boolean isDexItemBasedConstString():811:811 -> E
+    1:1:boolean isConstClass():827:827 -> A
+    1:1:boolean isConstNumber():807:807 -> B
+    1:1:boolean isConstString():811:811 -> C
+    1:1:boolean isConstant():831:831 -> D
+    1:1:boolean isDexItemBasedConstString():815:815 -> E
     boolean isFixedRegisterValue() -> F
-    1:1:boolean isLinked():388:388 -> G
-    1:3:boolean isNeverNull():987:989 -> H
+    1:1:boolean isLinked():392:392 -> G
+    1:3:boolean isNeverNull():991:993 -> H
     boolean isPhi() -> I
-    1:1:boolean isThis():1050:1050 -> J
-    1:1:boolean isUsed():489:489 -> K
+    1:1:boolean isThis():1063:1063 -> J
+    1:1:boolean isUsed():493:493 -> K
     boolean isValueOnStack() -> L
-    1:3:boolean isZero():1143:1145 -> M
-    1:3:void markAsArgument():998:1000 -> N
-    1:3:void markAsThis():1039:1041 -> O
+    1:3:boolean isZero():1156:1158 -> M
+    1:3:void markAsArgument():997:999 -> N
+    1:3:void markAsThis():1052:1054 -> O
     1:1:void markNonDebugLocalRead():137:137 -> P
-    1:3:boolean needsRegister():715:717 -> Q
-    1:1:int numberOfAllNonDebugUsers():477:477 -> R
-    1:1:int numberOfAllUsers():485 -> R
-    2:2:int numberOfAllUsers():485:485 -> R
-    1:1:int numberOfDebugUsers():481:481 -> S
-    1:5:int numberOfPhiUsers():469:473 -> T
-    1:5:int numberOfUsers():461:465 -> U
-    1:1:com.android.tools.r8.ir.code.ValueType outType():794:794 -> V
-    1:1:int requiredRegisters():291:291 -> W
-    1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():424:425 -> X
-    1:4:java.util.Set uniquePhiUsers():450:453 -> Y
-    1:4:java.util.Set uniqueUsers():417:420 -> Z
+    1:3:boolean needsRegister():719:721 -> Q
+    1:1:int numberOfAllNonDebugUsers():481:481 -> R
+    1:1:int numberOfAllUsers():489 -> R
+    2:2:int numberOfAllUsers():489:489 -> R
+    1:1:int numberOfDebugUsers():485:485 -> S
+    1:5:int numberOfPhiUsers():473:477 -> T
+    1:5:int numberOfUsers():465:469 -> U
+    1:1:com.android.tools.r8.ir.code.ValueType outType():798:798 -> V
+    1:1:int requiredRegisters():295:295 -> W
+    1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():428:429 -> X
+    1:4:java.util.Set uniquePhiUsers():454:457 -> Y
+    1:4:java.util.Set uniqueUsers():421:424 -> Z
     boolean lambda$fullyRemovePhiUser$1(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi) -> a
     1:13:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.Reporter):44:56 -> a
-    14:14:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1154:1154 -> a
+    14:14:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167:1167 -> a
     14:14:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.Reporter):57 -> a
     15:15:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.Reporter):46:46 -> a
     16:18:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
@@ -26865,138 +26942,157 @@
     117:117:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):128:128 -> a
     118:118:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueTypeConstraint):132:132 -> a
     118:118:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):128 -> a
-    119:119:com.android.tools.r8.ir.code.Value getAliasedValue():253:253 -> 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
-    150:150:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    150:150:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):844 -> a
-    151:152:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):844:845 -> a
-    153:153:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    153:153:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):849 -> a
-    154:157:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):849:852 -> a
-    158:158:com.android.tools.r8.ir.code.Value getAliasedValue():253:253 -> a
-    158:158:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):852 -> a
-    159:189:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):853:883 -> a
-    190:190:com.android.tools.r8.ir.code.Value getAliasedValue():253:253 -> a
-    190:190:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):883 -> a
-    191:205:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):890:904 -> a
-    206:206:com.android.tools.r8.ir.code.Value getAliasedValue():253:253 -> a
-    206:206:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):883 -> a
-    207:266:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):908:967 -> a
-    267:267:com.android.tools.r8.ir.code.Value getAliasedValue():253:253 -> a
-    267:267:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):852 -> a
-    268:288:com.android.tools.r8.ir.code.Value getAliasedValue(java.util.function.Predicate):257:277 -> a
-    289:291:void setLocalInfo(com.android.tools.r8.graph.DebugLocalInfo):303:305 -> a
-    292:295:boolean hasSameOrNoLocal(com.android.tools.r8.ir.code.Value):314:317 -> a
-    296:297:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):357:358 -> a
-    298:299:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):362:363 -> a
-    298:299:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):358 -> a
-    300:308:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():172:180 -> a
-    300:308:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):363 -> a
-    300:308:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):358 -> a
-    309:309:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():178:178 -> a
-    309:309:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):363 -> a
-    309:309:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):358 -> a
-    310:310:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():175:175 -> a
-    310:310:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):363 -> a
-    310:310:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):358 -> a
-    311:311:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):358:358 -> a
-    312:313:boolean onlyUsedInBlock(com.android.tools.r8.ir.code.BasicBlock):408:409 -> a
-    314:315:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):436:437 -> a
-    316:316:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    316:316:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):438 -> a
-    317:317:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):438:438 -> a
-    318:318:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    318:318:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):439 -> a
-    319:319:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):439:439 -> a
-    320:321:void addPhiUser(com.android.tools.r8.ir.code.Phi):555:556 -> a
-    322:323:java.util.Set affectedValues():606:607 -> a
-    324:324:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    324:324:java.util.Set affectedValues():608 -> a
-    325:329:java.util.Set affectedValues():609:613 -> a
-    330:357:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):645:672 -> a
-    358:367:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):679:688 -> a
-    368:381:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.join(com.android.tools.r8.ir.code.Value$DebugUse,com.android.tools.r8.ir.code.Value$DebugUse):185:198 -> a
-    368:381:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):688 -> a
-    382:382:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.join(com.android.tools.r8.ir.code.Value$DebugUse,com.android.tools.r8.ir.code.Value$DebugUse):186:186 -> a
-    382:382:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):688 -> a
-    383:383:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):688:688 -> a
-    384:392:void replaceDebugUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):693:701 -> a
-    393:394:void setLiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):706:707 -> a
-    395:396:void setNeedsRegister(boolean):721:722 -> a
-    397:419:boolean knownToBeBoolean(java.util.Set):1013:1035 -> a
-    420:420:void setValueRange(com.android.tools.r8.utils.LongInterval):1054:1054 -> a
-    421:421:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate):1091:1091 -> a
-    422:438:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1108:1124 -> a
-    439:439:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    439:439:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1127 -> a
-    440:446:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1129:1135 -> a
-    447:447:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1154:1154 -> a
-    448:450:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1173:1175 -> a
-    451:459:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1173:1181 -> a
-    460:460:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1154:1154 -> a
-    460:460:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1182 -> a
-    1:2:boolean usedInMonitorOperation():521:522 -> a0
+    119:119:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> a
+    119:119:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1235 -> a
+    120:138:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1236:1254 -> a
+    139:139:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
+    139:139:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1254 -> a
+    140:140:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
+    140:140:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1254 -> a
+    141:141:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1255:1255 -> a
+    142:142:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> a
+    142:142:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):835 -> a
+    143:154:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):836:847 -> a
+    155:155:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
+    155:155:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):848 -> a
+    156:157:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):848:849 -> a
+    158:158:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
+    158:158:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):853 -> a
+    159:162:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):853:856 -> a
+    163:163:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> a
+    163:163:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):856 -> a
+    164:194:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):857:887 -> a
+    195:195:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> a
+    195:195:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):887 -> a
+    196:210:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):894:908 -> a
+    211:211:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> a
+    211:211:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):887 -> a
+    212:271:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):912:971 -> a
+    272:272:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> a
+    272:272:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):856 -> a
+    273:293:com.android.tools.r8.ir.code.Value getAliasedValue(java.util.function.Predicate):261:281 -> a
+    294:296:void setLocalInfo(com.android.tools.r8.graph.DebugLocalInfo):307:309 -> a
+    297:300:boolean hasSameOrNoLocal(com.android.tools.r8.ir.code.Value):318:321 -> a
+    301:302:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):361:362 -> a
+    303:304:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):366:367 -> a
+    303:304:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362 -> a
+    305:313:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():172:180 -> a
+    305:313:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):367 -> a
+    305:313:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362 -> a
+    314:314:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():178:178 -> a
+    314:314:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):367 -> a
+    314:314:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362 -> a
+    315:315:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():175:175 -> a
+    315:315:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):367 -> a
+    315:315:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362 -> a
+    316:316:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362:362 -> a
+    317:318:boolean onlyUsedInBlock(com.android.tools.r8.ir.code.BasicBlock):412:413 -> a
+    319:320:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):440:441 -> a
+    321:321:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    321:321:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):442 -> a
+    322:322:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):442:442 -> a
+    323:323:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    323:323:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):443 -> a
+    324:324:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):443:443 -> a
+    325:326:void addPhiUser(com.android.tools.r8.ir.code.Phi):559:560 -> a
+    327:328:java.util.Set affectedValues():610:611 -> a
+    329:329:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    329:329:java.util.Set affectedValues():612 -> a
+    330:334:java.util.Set affectedValues():613:617 -> a
+    335:362:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):649:676 -> a
+    363:372:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):683:692 -> a
+    373:386:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.join(com.android.tools.r8.ir.code.Value$DebugUse,com.android.tools.r8.ir.code.Value$DebugUse):185:198 -> a
+    373:386:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):692 -> a
+    387:387:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.join(com.android.tools.r8.ir.code.Value$DebugUse,com.android.tools.r8.ir.code.Value$DebugUse):186:186 -> a
+    387:387:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):692 -> a
+    388:388:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):692:692 -> a
+    389:397:void replaceDebugUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):697:705 -> a
+    398:399:void setLiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):710:711 -> a
+    400:401:void setNeedsRegister(boolean):725:726 -> a
+    402:404:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):1007:1009 -> a
+    405:405:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> a
+    405:405:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):1009 -> a
+    406:408:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):1010:1012 -> a
+    409:409:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    409:409:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):1013 -> a
+    410:410:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):1018:1018 -> a
+    411:411:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> a
+    411:411:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):1009 -> a
+    412:434:boolean knownToBeBoolean(java.util.Set):1026:1048 -> a
+    435:435:void setValueRange(com.android.tools.r8.utils.LongInterval):1067:1067 -> a
+    436:436:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate):1104:1104 -> a
+    437:453:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1121:1137 -> a
+    454:454:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    454:454:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1140 -> a
+    455:461:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1142:1148 -> a
+    462:462:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167:1167 -> a
+    463:465:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1186:1188 -> a
+    466:474:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1186:1194 -> a
+    475:475:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167:1167 -> a
+    475:475:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1195 -> a
+    1:2:boolean usedInMonitorOperation():525:526 -> a0
     boolean lambda$fullyRemoveUser$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> b
-    1:2:com.android.tools.r8.ir.code.Value getSpecificAliasedValue(java.util.function.Predicate):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: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
+    1:2:com.android.tools.r8.ir.code.Value getSpecificAliasedValue(java.util.function.Predicate):286:287 -> b
+    3:6:void linkTo(com.android.tools.r8.ir.code.Value):371:374 -> b
+    7:8:java.util.Set aliasedUsers():433:434 -> b
+    9:10:void removePhiUser(com.android.tools.r8.ir.code.Phi):564:565 -> b
+    11:12:void addDebugUser(com.android.tools.r8.ir.code.Instruction):574:575 -> b
+    13:13:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):1099:1099 -> b
+    14:20:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1173:1179 -> b
+    21:21:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167:1167 -> b
+    21:21:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1180 -> b
+    22:40:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1206:1224 -> b
+    41:41:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> b
+    41:41:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1224 -> b
+    42:42:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable() -> b
+    42:42:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1224 -> b
+    43:45:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1226:1228 -> b
     com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue() -> c
-    1: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:10:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):493:497 -> c
+    1:1:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> c
+    1:1:boolean mayDependOnEnvironment(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):514 -> c
+    2:5:boolean mayDependOnEnvironment(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):515:518 -> c
+    6:10:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):497:501 -> c
     11:11:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> c
-    11:11:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):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
+    11:11:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):501 -> c
+    12:16:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):504:508 -> c
+    17:18:void addUser(com.android.tools.r8.ir.code.Instruction):534:535 -> c
+    19:20:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):569:570 -> c
+    21:33:void replaceUsers(com.android.tools.r8.ir.code.Value):624:636 -> c
     com.android.tools.r8.ir.code.Phi asPhi() -> d
-    1:5:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):583:587 -> d
-    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
+    1:5:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):587:591 -> d
+    6:6:boolean lambda$getDynamicLowerBoundType$4(com.android.tools.r8.ir.code.Value):1250:1250 -> d
+    1:2:void removeUser(com.android.tools.r8.ir.code.Instruction):539:540 -> e
+    3:8:void clearUsers():549:554 -> e
+    9:9:boolean lambda$getDynamicUpperBoundType$3(com.android.tools.r8.ir.code.Value):1207:1207 -> e
     boolean lambda$replaceSelectiveUsers$2(com.android.tools.r8.ir.code.Value) -> f
-    1:2:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):540:541 -> f
-    3:8:void clearUsersInfo():595:600 -> f
-    1:2:void computeNeedsRegister():726:727 -> g
-    1:1:java.util.Set debugUsers():457:457 -> h
-    1:1:int hashCode():760:760 -> hashCode
-    1:2:com.android.tools.r8.ir.code.Phi firstPhiUser():445:446 -> i
-    1:1:com.android.tools.r8.ir.code.Value getAliasedValue():253:253 -> j
-    1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():798:799 -> k
-    1:7:java.util.List getDebugLocalEnds():334:340 -> l
-    1:7:java.util.List getDebugLocalStarts():321:327 -> m
+    1:2:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):544:545 -> f
+    3:8:void clearUsersInfo():599:604 -> f
+    1:2:void computeNeedsRegister():730:731 -> g
+    1:1:java.util.Set debugUsers():461:461 -> h
+    1:1:int hashCode():764:764 -> hashCode
+    1:2:com.android.tools.r8.ir.code.Phi firstPhiUser():449:450 -> i
+    1:1:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> j
+    1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():802:803 -> k
+    1:7:java.util.List getDebugLocalEnds():338:344 -> l
+    1:7:java.util.List getDebugLocalStarts():325:331 -> m
     1:2:com.android.tools.r8.ir.code.Instruction getDefinition():238:239 -> n
-    1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():711:711 -> o
-    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():295:295 -> p
-    1:1:com.android.tools.r8.ir.code.Value getNextConsecutive():400:400 -> q
-    1:1:int getNumber():287:287 -> r
-    1:1:com.android.tools.r8.ir.code.Value getPreviousConsecutive():404:404 -> s
-    1:1:com.android.tools.r8.ir.code.Value getStartOfConsecutive():393 -> s
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice():1186:1186 -> t
-    1:8:java.lang.String toString():765:772 -> toString
+    1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():715:715 -> o
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():299:299 -> p
+    1:1:com.android.tools.r8.ir.code.Value getNextConsecutive():404:404 -> q
+    1:1:int getNumber():291:291 -> r
+    1:1:com.android.tools.r8.ir.code.Value getPreviousConsecutive():408:408 -> s
+    1:1:com.android.tools.r8.ir.code.Value getStartOfConsecutive():397 -> s
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice():1199:1199 -> t
+    1:8:java.lang.String toString():769:776 -> toString
     9:9:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> toString
-    9:9:java.lang.String toString():773 -> toString
-    10:27:java.lang.String toString():773:790 -> toString
-    1:11:com.android.tools.r8.utils.LongInterval getValueRange():1070:1080 -> u
-    1:1:boolean hasLocalInfo():299:299 -> v
-    1:1:boolean hasUsersInfo():591:591 -> w
-    1:1:boolean hasValueRange():1058:1058 -> x
-    1:8:boolean internalComputeNeedsRegister():731:738 -> y
-    1:1:boolean isArgument():1004:1004 -> z
+    9:9:java.lang.String toString():777 -> toString
+    10:27:java.lang.String toString():777:794 -> toString
+    1:11:com.android.tools.r8.utils.LongInterval getValueRange():1083:1093 -> u
+    1:1:boolean hasLocalInfo():303:303 -> v
+    1:1:boolean hasUsersInfo():595:595 -> w
+    1:1:boolean hasValueRange():1071:1071 -> x
+    1:8:boolean internalComputeNeedsRegister():735:742 -> y
+    1:1:boolean isArgument():1003:1003 -> z
 com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.D.b.z1:
     java.util.Map users -> b
     com.android.tools.r8.graph.DebugLocalInfo local -> a
@@ -27100,8 +27196,8 @@
     long decodedValue() -> a
 com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.D.b.G1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> G2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -27114,8 +27210,8 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):68:68 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
     com.android.tools.r8.ir.code.Xor asXor() -> t0
-    boolean isXor() -> u2
-    int opcode() -> x2
+    boolean isXor() -> v2
+    int opcode() -> y2
 com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver -> com.android.tools.r8.D.c.c:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
@@ -27214,53 +27310,53 @@
     int maxDepth -> h
     int currentDepth -> g
     java.util.Map removedEdges -> f
-    1:1:void <clinit>():294:294 -> <clinit>
-    1:1:void <init>(java.util.Collection,com.android.tools.r8.utils.InternalOptions):353:353 -> <init>
-    2:23:void <init>(java.util.Collection,com.android.tools.r8.utils.InternalOptions):339:360 -> <init>
-    1:8:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult breakCycles():365:372 -> a
-    9:14:void reset():379:384 -> a
-    9:14:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult breakCycles():374 -> a
-    15:15:boolean edgeRemovalIsSafe(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):531:531 -> a
-    16:16:void recordEdgeRemoval(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):535:535 -> a
-    17:19:java.util.Collection reorderNodes(java.util.List):546:548 -> a
-    1:1:java.util.Set lambda$recordEdgeRemoval$0(com.android.tools.r8.ir.conversion.CallGraph$Node):535:535 -> b
-    1:7:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):388:394 -> c
-    8:10:void push(com.android.tools.r8.ir.conversion.CallGraph$Node):491:493 -> c
-    8:10:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):399 -> c
-    11:91:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):403:483 -> c
-    92:110:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):423:441 -> c
-    111:118:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):437:444 -> c
-    119:123:java.util.LinkedList extractCycle(com.android.tools.r8.ir.conversion.CallGraph$Node):504:508 -> c
-    119:123:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):447 -> c
-    124:125:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):449:450 -> c
-    126:134:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):513:521 -> c
-    126:134:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):456 -> c
-    135:147:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):461:473 -> c
-    148:148:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):468:468 -> c
-    149:151:void recoverStack(java.util.LinkedList):539:541 -> c
-    149:151:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):478 -> c
-    152:152:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):525:525 -> c
-    152:152:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):456 -> c
+    1:1:void <clinit>():302:302 -> <clinit>
+    1:1:void <init>(java.util.Collection,com.android.tools.r8.utils.InternalOptions):361:361 -> <init>
+    2:23:void <init>(java.util.Collection,com.android.tools.r8.utils.InternalOptions):347:368 -> <init>
+    1:8:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult breakCycles():373:380 -> a
+    9:14:void reset():387:392 -> a
+    9:14:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult breakCycles():382 -> a
+    15:15:boolean edgeRemovalIsSafe(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):539:539 -> a
+    16:16:void recordEdgeRemoval(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):543:543 -> a
+    17:19:java.util.Collection reorderNodes(java.util.List):554:556 -> a
+    1:1:java.util.Set lambda$recordEdgeRemoval$0(com.android.tools.r8.ir.conversion.CallGraph$Node):543:543 -> b
+    1:7:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):396:402 -> c
+    8:10:void push(com.android.tools.r8.ir.conversion.CallGraph$Node):499:501 -> c
+    8:10:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):407 -> c
+    11:91:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):411:491 -> c
+    92:110:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):431:449 -> c
+    111:118:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):445:452 -> c
+    119:123:java.util.LinkedList extractCycle(com.android.tools.r8.ir.conversion.CallGraph$Node):512:516 -> c
+    119:123:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):455 -> c
+    124:125:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):457:458 -> c
+    126:134:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):521:529 -> c
+    126:134:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):464 -> c
+    135:147:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):469:481 -> c
+    148:148:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):476:476 -> c
+    149:151:void recoverStack(java.util.LinkedList):547:549 -> c
+    149:151:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):486 -> c
+    152:152:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):533:533 -> c
+    152:152:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):464 -> c
     153:153:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> c
-    153:153:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):525 -> c
-    153:153:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):456 -> c
-    154:154:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):525:525 -> c
-    154:154:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):456 -> c
-    155:158:void pop(com.android.tools.r8.ir.conversion.CallGraph$Node):497:500 -> c
-    155:158:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):486 -> c
-    159:159:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):487:487 -> c
+    153:153:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):533 -> c
+    153:153:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):464 -> c
+    154:154:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):533:533 -> c
+    154:154:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):464 -> c
+    155:158:void pop(com.android.tools.r8.ir.conversion.CallGraph$Node):505:508 -> c
+    155:158:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):494 -> c
+    159:159:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):495:495 -> c
 com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge -> com.android.tools.r8.D.c.f:
     com.android.tools.r8.ir.conversion.CallGraph$Node callee -> b
     com.android.tools.r8.ir.conversion.CallGraph$Node caller -> a
-    1:3:void <init>(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):304:306 -> <init>
-    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$300(com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge):299:299 -> a
-    2:2:void remove():310:310 -> a
-    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$400(com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge):299:299 -> b
+    1:3:void <init>(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):312:314 -> <init>
+    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$300(com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge):307:307 -> a
+    2:2:void remove():318:318 -> a
+    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$400(com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge):307:307 -> b
 com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult -> com.android.tools.r8.D.c.g:
     java.util.Map removedEdges -> a
-    1:2:void <init>(java.util.Map):318:319 -> <init>
-    1:1:void forEachRemovedCaller(com.android.tools.r8.ir.conversion.CallGraph$Node,java.util.function.Consumer):323:323 -> a
-    2:3:int numberOfRemovedEdges():328:329 -> a
+    1:2:void <init>(java.util.Map):326:327 -> <init>
+    1:1:void forEachRemovedCaller(com.android.tools.r8.ir.conversion.CallGraph$Node,java.util.function.Consumer):331:331 -> a
+    2:3:int numberOfRemovedEdges():336:337 -> a
 com.android.tools.r8.ir.conversion.CallGraphBuilder$InvokeExtractor -> com.android.tools.r8.D.c.i:
     com.android.tools.r8.ir.conversion.CallGraphBuilder this$0 -> d
     boolean $assertionsDisabled -> e
@@ -27268,26 +27364,28 @@
     1:1:void <clinit>():112:112 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.conversion.CallGraphBuilder,com.android.tools.r8.ir.conversion.CallGraph$Node):116:118 -> <init>
     1:3:void addClassInitializerTarget(com.android.tools.r8.graph.DexClass):122:124 -> a
-    4:6:void addTarget(com.android.tools.r8.graph.DexEncodedMethod,boolean):137:139 -> a
-    7:29:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):144:166 -> a
-    30:31:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):152:153 -> a
-    32:32:void lambda$processInvoke$0(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):153:153 -> a
-    33:36:java.util.Set lambda$processInvokeWithDynamicDispatch$1(boolean,com.android.tools.r8.graph.DexMethod):192:195 -> a
-    37:37:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):228:228 -> a
-    38:38:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):258:258 -> a
-    39:39:void registerCallSite(com.android.tools.r8.graph.DexCallSite):289:289 -> a
-    1:32:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):173:204 -> b
-    33:33:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):240:240 -> b
-    34:34:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):252:252 -> b
-    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):234:234 -> c
-    2:3:boolean registerNewInstance(com.android.tools.r8.graph.DexType):264:265 -> c
-    4:4:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):272:272 -> c
+    4:15:void addTarget(com.android.tools.r8.graph.DexEncodedMethod,boolean):137:148 -> a
+    16:38:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):152:174 -> a
+    39:40:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):160:161 -> a
+    41:41:void lambda$processInvoke$0(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):161:161 -> a
+    42:45:java.util.Set lambda$processInvokeWithDynamicDispatch$1(boolean,com.android.tools.r8.graph.DexMethod):200:203 -> a
+    46:46:java.util.Set com.android.tools.r8.graph.ResolutionResult.lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):33:33 -> a
+    46:46:java.util.Set lambda$processInvokeWithDynamicDispatch$1(boolean,com.android.tools.r8.graph.DexMethod):203 -> a
+    47:47:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):236:236 -> a
+    48:48:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):266:266 -> a
+    49:49:void registerCallSite(com.android.tools.r8.graph.DexCallSite):297:297 -> a
+    1:32:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):181:212 -> b
+    33:33:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):248:248 -> b
+    34:34:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):260:260 -> b
+    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):242:242 -> c
+    2:3:boolean registerNewInstance(com.android.tools.r8.graph.DexType):272:273 -> c
+    4:4:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):280:280 -> c
     boolean registerTypeReference(com.android.tools.r8.graph.DexType) -> d
-    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):246:246 -> d
-    2:2:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):278:278 -> d
+    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):254:254 -> d
+    2:2:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):286:286 -> d
     1:4:void addClassInitializerTarget(com.android.tools.r8.graph.DexType):129:132 -> e
-    5:8:void processFieldAccess(com.android.tools.r8.graph.DexField):212:215 -> e
-    9:9:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):222:222 -> e
+    5:8:void processFieldAccess(com.android.tools.r8.graph.DexField):220:223 -> e
+    9:9:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):230:230 -> e
 com.android.tools.r8.ir.conversion.CallSiteInformation -> com.android.tools.r8.D.c.m:
     1:1:void <init>():14:14 -> <init>
     boolean hasDoubleCallSite(com.android.tools.r8.graph.DexMethod) -> a
@@ -27345,7 +27443,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):959:959 -> a
+    35:35:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     35:35:void rewriteNots():234 -> a
     35:35:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
     36:38:void rewriteNots():235:237 -> a
@@ -27575,7 +27673,7 @@
     10:10:java.util.List com.android.tools.r8.graph.CfCode.getInstructions():131:131 -> a
     10:10:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):297 -> a
     11:13:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):297:299 -> a
-    14:14:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    14:14:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     14:14:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299 -> a
     15:16:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299:300 -> a
     17:43:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299:325 -> a
@@ -27937,10 +28035,10 @@
     109:109:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):587:587 -> a
     109:109:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):427 -> a
     110:123:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):429:442 -> a
-    124:124:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    124:124:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     124:124:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):443 -> a
     125:153:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):445:473 -> a
-    154:154:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):430:430 -> a
+    154:154:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):475:475 -> a
     154:154:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):474 -> a
     155:166:void rewriteIfs():490:501 -> a
     155:166:com.android.tools.r8.graph.DexCode build():184 -> a
@@ -27958,7 +28056,7 @@
     214:214:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
     214:214:com.android.tools.r8.graph.DexCode build():226 -> a
     215:225:com.android.tools.r8.graph.DexCode build():227:237 -> a
-    226:226:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():1327:1327 -> a
+    226:226:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():1329:1329 -> a
     226:226:com.android.tools.r8.graph.DexCode build():237 -> a
     227:245:com.android.tools.r8.graph.DexCode build():238:256 -> a
     246:246:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
@@ -28573,7 +28671,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():1478:1478 -> a
+    206:206:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
     206:206:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):574 -> a
     207:209:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):575:577 -> a
     210:210:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
@@ -28584,14 +28682,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():1478:1478 -> a
+    251:251:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
     251:251:void joinPredecessorsWithIdenticalPhis():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):499:510 -> a
+    268:279:void com.android.tools.r8.ir.code.BasicBlock.removePredecessorsByIndex(java.util.List):506:517 -> 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
@@ -28604,14 +28702,14 @@
     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):1013:1013 -> a
+    336:336:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder):1085:1085 -> a
     336:336:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):610 -> a
     337:345:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):611:619 -> a
     346:346:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     346:346:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):619 -> a
     347:347:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):619:619 -> a
     348:361:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):616:629 -> a
-    362:362:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1074:1074 -> a
+    362:362:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1076:1076 -> a
     362:362:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):629 -> a
     363:363:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630:630 -> a
     364:375:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):124:135 -> a
@@ -28665,7 +28763,7 @@
     428:428:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo):916 -> a
     429:432:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo):917:920 -> a
     433:437:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):958:962 -> a
-    438:438:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():575:575 -> a
+    438:438:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():579:579 -> a
     438:438:boolean isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):934 -> a
     438:438:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):963 -> a
     439:439:boolean isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):934:934 -> a
@@ -28713,7 +28811,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():330:330 -> a
+    556:556:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     556:556:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141 -> a
     556:556:void addConstString(int,com.android.tools.r8.graph.DexString):1149 -> a
     557:558:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1142:1143 -> a
@@ -28722,7 +28820,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():330:330 -> a
+    564:564:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     564:564:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141 -> a
     564:564:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1158 -> a
     565:566:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1142:1143 -> a
@@ -28879,7 +28977,7 @@
     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:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():579:579 -> a
     999:999:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1981 -> a
     1000:1010:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1982:1992 -> a
     1011:1015:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1990:1994 -> a
@@ -28992,7 +29090,7 @@
     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:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> b
     59:59:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531 -> b
     60:66:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531:1537 -> b
     67:70:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1664:1667 -> b
@@ -29355,15 +29453,16 @@
     1:1:com.android.tools.r8.ir.code.BasicBlock access$100(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):181:181 -> a
     1:1:int access$400(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):181:181 -> b
 com.android.tools.r8.ir.conversion.IRConverter -> com.android.tools.r8.D.c.Y:
+    java.util.List neverMergePrefixes -> Q
     com.android.tools.r8.graph.AppView appView -> a
-    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.info.OptimizationFeedback simpleOptimizationFeedback -> M
+    com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed delayedOptimizationFeedback -> M
     com.android.tools.r8.ir.optimize.ConstantCanonicalizer constantCanonicalizer -> v
-    boolean seenNeverMergePrefix -> R
+    boolean seenNotNeverMergePrefix -> R
     com.android.tools.r8.ir.optimize.Inliner inliner -> y
+    boolean $assertionsDisabled -> T
     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
@@ -29375,442 +29474,397 @@
     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.optimize.info.MethodOptimizationInfoCollector methodOptimizationInfoCollector -> L
     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.naming.IdentifierNameStringMarker identifierNameStringMarker -> z
+    com.android.tools.r8.graph.DexString highestSortingString -> O
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner classInliner -> q
     com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer covariantReturnTypeAnnotationTransformer -> B
-    java.util.List neverMergePrefixes -> P
+    java.util.List onWaveDoneActions -> P
     com.android.tools.r8.ir.optimize.MemberValuePropagation memberValuePropagation -> w
     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 seenNotNeverMergePrefix -> Q
-    boolean $assertionsDisabled -> S
     com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> k
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter interfaceMethodRewriter -> m
+    boolean seenNeverMergePrefix -> S
     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.info.OptimizationFeedback simpleOptimizationFeedback -> N
     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
-    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):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:void <clinit>():119:119 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):185:185 -> <init>
+    2:170:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):168:336 -> <init>
+    boolean lambda$materializeInstructionBeforeLongOperationsWorkaround$20(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
     1:1:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    1:1:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):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
+    1:1:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):685 -> a
+    2:2:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):685:685 -> a
+    3:3:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):681:681 -> a
+    4:4:java.lang.String lambda$new$0(java.lang.String):205:205 -> a
+    5:8:java.util.Set getDesugaredCallSites():340:343 -> a
+    9:16:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):444:451 -> a
+    17:18:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):384:385 -> a
+    17:18:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):453 -> a
+    19:21:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):391:393 -> a
+    19:21:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):454 -> a
+    22:22:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):455:455 -> a
+    23:24:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):415:416 -> a
+    23:24:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):455 -> a
+    25:26:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):424:425 -> a
+    25:26:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):456 -> a
+    27:28:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):431:432 -> a
+    27:28:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):457 -> a
+    29:30:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):437:438 -> a
+    29:30:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):458 -> a
+    31:32:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):901:902 -> a
+    31:32:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):459 -> a
+    33:36:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):461:464 -> a
+    37:43:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):468:474 -> a
+    44:45:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):499:500 -> a
+    44:45:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):475 -> a
     46:53:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithout(com.android.tools.r8.graph.DexType):102:109 -> a
-    46:53:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):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
+    46:53:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):501 -> a
+    46:53:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):475 -> a
+    54:54:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):501:501 -> a
+    54:54:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):475 -> a
+    55:59:void convertClasses(java.lang.Iterable,java.util.concurrent.ExecutorService):537:541 -> a
+    60:62:void lambda$convertMethods$4(boolean,com.android.tools.r8.graph.DexEncodedMethod):556:558 -> a
+    63:71:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):622:630 -> a
+    72:73:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):881:882 -> a
+    72:73:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):631 -> a
     74:74:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    74:74:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):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
+    74:74:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):882 -> a
+    74:74:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):631 -> a
+    75:76:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):405:406 -> a
+    75:76:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):632 -> a
+    77:85:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):641:649 -> a
     86:86:com.android.tools.r8.ir.conversion.CallGraphBuilder com.android.tools.r8.ir.conversion.CallGraph.builder(com.android.tools.r8.graph.AppView):156:156 -> a
     86:86:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):170 -> a
-    86:86:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):654 -> a
+    86:86:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):649 -> a
     87:88:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):170:171 -> a
-    87:88:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):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
+    87:88:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):649 -> a
+    89:140:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):650:701 -> a
+    141:141:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    141:141:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):701 -> a
+    142:142:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):702:702 -> a
+    143:144:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):399:400 -> a
+    143:144:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):703 -> a
+    145:148:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):707:710 -> a
+    149:151:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):391:393 -> a
+    149:151:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):711 -> a
+    152:153:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):713:714 -> a
+    154:155:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):415:416 -> a
+    154:155:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):714 -> a
+    156:156:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):716:716 -> a
+    157:158:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):424:425 -> a
+    157:158:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):717 -> a
+    159:160:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):431:432 -> a
+    159:160:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):718 -> a
+    161:163:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):719:721 -> a
+    164:165:void finalizeLambdaMerging(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):892:893 -> a
+    164:165:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):722 -> a
+    166:166:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):724:724 -> a
+    167:168:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):901:902 -> a
+    167:168:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):725 -> a
+    169:171:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):727:729 -> a
+    172:187:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):728:743 -> a
+    188:190:com.android.tools.r8.graph.DexType computeOutlineClassType():943:945 -> a
+    188:190:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):743 -> a
+    191:191:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    191:191:com.android.tools.r8.graph.DexType computeOutlineClassType():945 -> a
+    191:191:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):743 -> a
+    192:194:com.android.tools.r8.graph.DexType computeOutlineClassType():946:948 -> a
+    192:194:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):743 -> a
+    195:247:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):743:795 -> a
+    248:255:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):789:796 -> a
     256:256:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    256:256:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):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
+    256:256:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):649 -> a
+    257:257:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):660:660 -> a
+    258:258:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):656:656 -> a
+    259:260:void lambda$optimize$8(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):740:741 -> a
+    261:264:void waveStart(java.util.Collection):800:803 -> a
+    265:265:void addWaveDoneAction(com.android.tools.r8.utils.Action):814:814 -> a
+    266:266:boolean isInWave():824:824 -> a
+    266:266:void addWaveDoneAction(com.android.tools.r8.utils.Action):817 -> a
+    267:267:void addWaveDoneAction(com.android.tools.r8.utils.Action):820:820 -> a
+    268:268:void addWaveDoneAction(com.android.tools.r8.utils.Action):818:818 -> a
+    269:269:void addWaveDoneAction(com.android.tools.r8.utils.Action):815:815 -> a
+    270:270:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):828:828 -> a
+    271:276:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):838:843 -> a
+    277:294:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):842:859 -> a
+    295:305:java.lang.Object lambda$forEachSelectedOutliningMethod$13(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):845:855 -> a
+    306:306:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):864:864 -> a
     307:307:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    307:307:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):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
+    307:307:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):865 -> a
+    308:310:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):865:867 -> a
+    311:322:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):866:877 -> a
     323:323:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    323:323:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):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
+    323:323:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):865 -> a
+    324:324:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):911:911 -> a
+    325:328:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):955:958 -> a
+    329:334:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):964:969 -> a
+    335:340:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):973:978 -> a
     341:341:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    341:341:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):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
+    341:341:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):979 -> a
+    342:342:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):979:979 -> a
+    343:343:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):975:975 -> a
+    344:346:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):996:998 -> a
+    347:347:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):997:997 -> a
+    348:348:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1000:1000 -> a
     349:349:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    349:349:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):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
+    349:349:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1004 -> a
+    350:350:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1004:1004 -> a
+    351:351:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1000:1000 -> a
+    352:358:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1021:1027 -> a
+    359:361:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1069:1071 -> a
+    362:367:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1070:1075 -> a
+    368:368:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1012:1012 -> a
+    368:368:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1075 -> a
+    369:369:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1075:1075 -> a
+    370:383:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1074:1087 -> a
+    384:389:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1731:1736 -> a
+    384:389:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1090 -> a
+    390:396:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1091:1097 -> a
+    397:397:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1281:1281 -> a
+    397:397:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1097 -> a
+    398:412:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1098:1112 -> a
+    413:413:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():979:979 -> a
+    413:413:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1112 -> a
+    414:428:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1113:1127 -> a
+    429:429:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484:1484 -> a
+    429:429:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    430:430:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    430:430:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484 -> a
+    430:430:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    431:433:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484:1486 -> a
+    431:433:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    434:434:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    434:434:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1486 -> a
+    434:434:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    435:438:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1487:1490 -> a
+    435:438:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    439:453:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1136:1150 -> a
     454:454:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):90:90 -> a
-    454:454:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):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
+    454:454:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1151 -> a
+    455:500:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1152:1197 -> a
     501:501:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    501:501:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):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
+    501:501:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1197 -> a
+    502:555:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1202:1255 -> a
+    556:558:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):1032:1034 -> a
+    556:558:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1256 -> a
+    559:567:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1259:1267 -> a
+    568:586:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1266:1284 -> a
+    587:587:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():979:979 -> a
+    587:587:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1284 -> a
+    588:611:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1285:1308 -> a
+    612:630:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1300:1318 -> a
     631:631:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    631:631:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):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
+    631:631:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1301 -> a
+    632:681:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1321:1370 -> a
+    682:682:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    682:682:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1370 -> a
+    683:693:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1371:1381 -> a
+    694:699:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):891:896 -> a
+    694:699:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1381 -> a
+    700:743:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1382:1425 -> a
+    744:748:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):189:193 -> a
+    744:748:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1425 -> a
+    749:755:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.collectParameterUsages(int,com.android.tools.r8.ir.code.Value):205:211 -> a
+    749:755:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):196 -> a
+    749:755:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1425 -> a
+    756:759:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):198:201 -> a
+    756:759:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1425 -> a
+    760:776:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1426:1442 -> a
+    777:777:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):189:189 -> a
+    777:777:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1425 -> a
+    778:780:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1447:1449 -> a
+    781:781:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1289:1289 -> a
+    781:781:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1449 -> a
+    782:789:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1450:1457 -> a
+    790:790:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
+    790:790:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1460 -> a
+    791:796:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1460:1465 -> a
+    797:797:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
+    797:797:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1465 -> a
+    798:799:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1465:1466 -> a
+    800:805:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1465:1470 -> a
+    806:806:void lambda$rewriteCodeInternal$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1184:1184 -> a
+    807:807:com.android.tools.r8.ir.optimize.InliningOracle lambda$rewriteCodeInternal$17(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):1310:1310 -> a
+    808:809:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1474:1475 -> a
+    810:810:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    810:810:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1475 -> a
+    811:815:void finalizeToCf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1494:1498 -> a
+    811:815:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1476 -> a
+    816:816:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1478:1478 -> a
+    817:817:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1503:1503 -> a
+    817:817:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    818:823:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1542:1547 -> a
+    818:823:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    818:823:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    824:824:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1314:1314 -> a
+    824:824:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1547 -> a
+    824:824:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    824:824:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    825:825:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548:1548 -> a
+    825:825:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    825:825:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    826:838:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3680:3692 -> a
+    826:838:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> a
+    826:838:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    826:838:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    839:839:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
+    839:839:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3693 -> a
+    839:839:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> a
+    839:839:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    839:839:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    840:841:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3693:3694 -> a
+    840:841:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> a
+    840:841:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    840:841:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    842:842:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3680:3680 -> a
+    842:842:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> a
+    842:842:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    842:842:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    843:852:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1550:1559 -> a
+    843:852:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    843:852:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    853:853:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1558:1558 -> a
+    853:853:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    853:853:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    854:854:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1506:1506 -> a
+    854:854:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    855:859:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1530:1534 -> a
+    855:859:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1507 -> a
+    855:859:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    860:862:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1508:1510 -> a
+    860:862:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    863:863:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1012:1012 -> a
+    863:863:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1510 -> a
+    863:863:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    864:864:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1510:1510 -> a
+    864:864:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    865:869:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1509:1513 -> a
+    865:869:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    870:870:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1616:1616 -> a
+    871:871:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1265:1265 -> a
+    871:871:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1616 -> a
+    872:883:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1619:1630 -> a
+    884:886:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1676:1678 -> a
+    884:886:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1631 -> a
+    887:887:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1634:1634 -> a
+    888:889:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1683:1684 -> a
+    888:889:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1635 -> a
+    890:891:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1688:1689 -> a
+    890:891:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1638 -> a
+    892:893:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1641:1642 -> a
+    894:898:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1662:1666 -> a
+    894:898:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1643 -> a
+    899:904:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1644:1649 -> a
+    905:905:void ensureThrowingInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):1698:1698 -> a
+    905:905:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
+    906:906:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    906:906:void ensureThrowingInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):1698 -> a
+    906:906:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
+    907:909:void ensureThrowingInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):1699:1701 -> a
+    907:909:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
+    910:910:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.InstructionListIterator.split(com.android.tools.r8.ir.code.IRCode):99:99 -> a
+    910:910:void ensureThrowingInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):1703 -> a
+    910:910:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
+    911:916:void ensureThrowingInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):1704:1709 -> a
+    911:916:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
+    917:918:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$19(com.android.tools.r8.graph.DexItemFactory):1624:1625 -> a
+    919:919:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$19(com.android.tools.r8.graph.DexItemFactory):1623:1623 -> a
+    920:920:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1671:1671 -> a
+    921:921:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1747:1747 -> a
+    922:922:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
+    922:922:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1748 -> a
+    923:940:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1749:1766 -> a
+    1:6:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):480:485 -> b
+    7:18:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):483:494 -> b
+    19:28:void convertMethods(com.android.tools.r8.graph.DexProgramClass):545:554 -> b
+    29:57:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):564:592 -> b
     58:58:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
-    58:58:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):597 -> b
-    59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> b
+    58:58:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):592 -> b
+    59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> b
+    59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> b
     59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> b
-    59:59:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):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
+    59:59:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):592 -> b
+    60:64:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):592:596 -> b
+    65:65:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> b
+    65:65:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596 -> b
+    66:72:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596:602 -> b
+    73:73:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):599:599 -> b
     74:74:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> b
-    74:74:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):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):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):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):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):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
+    74:74:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):599 -> b
+    75:80:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):599:604 -> b
+    81:81:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> b
+    81:81:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):604 -> b
+    82:86:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1530:1534 -> b
+    82:86:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):605 -> b
+    87:89:void lambda$optimize$9(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):749:751 -> b
+    90:90:boolean isInWave():824:824 -> b
+    91:93:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):987:989 -> b
+    94:102:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1045:1053 -> b
+    103:103:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1051:1051 -> b
+    104:109:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1519:1524 -> b
+    110:114:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1522:1526 -> b
+    115:115:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1565:1565 -> b
+    116:116:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1302:1302 -> b
+    116:116:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1565 -> b
+    117:121:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1569:1573 -> b
+    122:122:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> b
+    122:122:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1574 -> b
+    123:134:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1574:1585 -> b
+    135:135:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1715:1715 -> b
+    135:135:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
+    136:136:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> b
+    136:136:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1715 -> b
+    136:136:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
+    137:139:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1716:1718 -> b
+    137:139:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
+    140:140:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> b
+    140:140:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1718 -> b
+    140:140:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
+    141:143:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1719:1721 -> b
+    141:143:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
     144:144:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):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):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
+    144:144:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1722 -> b
+    144:144:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
+    145:147:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1724:1726 -> b
+    145:147:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
+    148:148:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> b
+    148:148:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1727 -> b
+    148:148:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
+    149:153:boolean lambda$workaroundForwardingInitializerBug$18(com.android.tools.r8.ir.code.Instruction):1587:1591 -> b
+    154:155:void printPhase(java.lang.String):1741:1742 -> b
+    1:20:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):507:526 -> c
+    21:27:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):525:531 -> c
     28:41:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithAddedOrReplaced(com.android.tools.r8.graph.DexAnnotation):125:138 -> c
-    28:41:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):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
+    28:41:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):531 -> c
+    42:42:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):531:531 -> c
+    43:43:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):829:829 -> c
     44:44:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> c
-    44:44:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):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
+    44:44:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):830 -> c
+    45:45:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):830:830 -> c
+    46:46:void lambda$computeReachabilitySensitivity$11(com.android.tools.r8.graph.DexEncodedMethod):830:830 -> c
+    47:47:void clearDexMethodCompilationState():907:907 -> c
     boolean lambda$convertMethod$5(com.android.tools.r8.graph.DexEncodedMethod) -> d
-    1:7:boolean enableTryWithResourcesDesugaring():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
+    1:7:boolean enableTryWithResourcesDesugaring():366:372 -> d
+    8:8:void lambda$convertClasses$3(com.android.tools.r8.graph.DexProgramClass):539:539 -> d
+    1:1:boolean enableTwrCloseResourceDesugaring():362:362 -> e
+    2:2:com.android.tools.r8.graph.DexType lambda$updateMainDexListWithSynthesizedClassMap$1(com.android.tools.r8.graph.DexProgramClass):484:484 -> e
+    3:7:java.lang.Object lambda$forEachSynthesizedServiceLoaderMethod$14(com.android.tools.r8.graph.DexEncodedMethod):869:873 -> e
+    1:2:boolean removeLambdaDeserializationMethods():376:377 -> f
+    3:3:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$2(com.android.tools.r8.graph.DexProgramClass):523:523 -> f
+    4:4:void lambda$waveStart$10(com.android.tools.r8.graph.DexEncodedMethod):803:803 -> f
+    1:3:void waveDone():808:810 -> g
 com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.D.c.a0:
     java.util.Map protoFixupCache -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -29829,7 +29883,7 @@
     42:42:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     42:42:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):116 -> a
     43:58:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):117:132 -> a
-    59:59:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():977:977 -> a
+    59:59:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():979:979 -> a
     59:59:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):132 -> a
     60:63:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):133:136 -> a
     64:104:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):135:175 -> a
@@ -29951,12 +30005,12 @@
     boolean verifyRegister(int) -> f
     int instructionIndex(int) -> g
 com.android.tools.r8.ir.conversion.StringSwitchConverter -> com.android.tools.r8.D.c.l0:
-    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     1:1:boolean isDefinedByStringHashCode(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):184 -> a
     1:1:boolean access$700(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104 -> a
     2:7:boolean isDefinedByStringHashCode(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):185:190 -> a
     2:7:boolean access$700(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104 -> a
-    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     8:8:boolean isDefinedByStringHashCode(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):184 -> a
     8:8:boolean access$700(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104 -> a
 com.android.tools.r8.ir.conversion.StringSwitchConverter$1 -> com.android.tools.r8.D.c.d0:
@@ -29984,13 +30038,13 @@
     24:24:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping setFallthroughBlock(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):622:622 -> a
     24:24:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):658 -> a
     25:45:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):663:683 -> a
-    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     46:46:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):684 -> a
     47:62:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):685:700 -> a
     63:63:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):687:687 -> a
     64:64:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping setFallthroughBlock(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):622:622 -> a
     64:64:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):687 -> a
-    65:65:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    65:65:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     65:65:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):684 -> a
     66:66:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):675:675 -> a
     67:67:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping setFallthroughBlock(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):622:622 -> a
@@ -30044,7 +30098,7 @@
     2:4:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):360:362 -> a
     5:23:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.If):404:422 -> a
     5:23:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):362 -> a
-    24:24:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    24:24:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     24:24:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.If):423 -> a
     24:24:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):362 -> a
     25:35:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.If):424:434 -> a
@@ -30054,7 +30108,7 @@
     36:36:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):362 -> a
     37:45:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.If):441:449 -> a
     37:45:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):362 -> a
-    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     46:46:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.If):423 -> a
     46:46:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):362 -> a
     47:48:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):364:365 -> a
@@ -30069,7 +30123,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():1425:1427 -> b
+    28:30:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.startOfGotoChain():1461:1463 -> b
     28:30:com.android.tools.r8.ir.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
@@ -30095,10 +30149,10 @@
     1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.IdentifierNameStringMarker):43:47 -> <init>
     1:21:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):51:71 -> a
     22:45:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):80:103 -> a
-    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     46:46:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):104 -> a
     47:52:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):104:109 -> a
-    53:53:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    53:53:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     53:53:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):110 -> a
     54:75:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):111:132 -> a
     76:88:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):129:141 -> a
@@ -30237,7 +30291,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():879:879 -> a
+    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     2:2:void desugar(com.android.tools.r8.ir.code.IRCode):93 -> a
     3: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
@@ -30273,13 +30327,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():309:309 -> a
+    12:12:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     12:12:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1308 -> a
     13:13:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1309:1309 -> a
     14:14:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
     14:14:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):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):1220:1220 -> a
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     16:16:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1319 -> a
     17:17:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1320:1320 -> a
     18:18:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1326:1326 -> a
@@ -30330,12 +30384,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):1220:1220 -> c
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> c
     4:4:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):76 -> c
     4:4:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):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):1333:1333 -> c
+    8:8:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> c
     8:8:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):77 -> c
     8:8:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):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
@@ -30350,23 +30404,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):1333:1333 -> e
+    158:158:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> e
     158:158:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1055 -> e
     159:165:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1056:1062 -> e
-    166:166:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> e
+    166:166:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> e
     166:166:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1063 -> e
     167:167:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1064:1064 -> e
     1:12:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1082:1093 -> f
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f
     13:13:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1094 -> f
     14:28:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1094:1108 -> f
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f
     29:29:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1111 -> f
     30:30:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1111:1111 -> f
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f
     31:31:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1112 -> f
     32:32:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1112:1112 -> f
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f
     33:33:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1113 -> f
     34:49:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1113:1128 -> f
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.D.d.h:
@@ -30425,7 +30479,12 @@
     112:157:void process(com.android.tools.r8.graph.DexClass):96 -> a
     158:170:void process(com.android.tools.r8.graph.DexClass):97:109 -> a
     171:189:com.android.tools.r8.graph.DexEncodedMethod addForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):113:131 -> a
-    190:209:void hideCandidates(java.util.List,java.util.List,java.util.List):260:279 -> a
+    190:194:void hideCandidates(java.util.List,java.util.List,java.util.List):260:264 -> a
+    195:195:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    195:195:void hideCandidates(java.util.List,java.util.List,java.util.List):264 -> a
+    196:209:void hideCandidates(java.util.List,java.util.List,java.util.List):266:279 -> a
+    210:210:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    210:210:void hideCandidates(java.util.List,java.util.List,java.util.List):264 -> a
 com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.D.d.l:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.ir.conversion.IRConverter converter -> a
@@ -30529,9 +30588,20 @@
     java.util.Set hidden -> b
     1:5:void <init>():19:23 -> <init>
     1:2:void merge(com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection):62:63 -> a
-    3:8:void hideMatches(com.android.tools.r8.graph.DexMethod):67:72 -> a
-    9:9:void addDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):78:78 -> a
-    10:43:java.util.List createCandidatesList():83:116 -> a
+    3:5:void hideMatches(com.android.tools.r8.graph.DexMethod):67:69 -> a
+    6:6:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    6:6:void hideMatches(com.android.tools.r8.graph.DexMethod):70 -> a
+    7:8:void hideMatches(com.android.tools.r8.graph.DexMethod):71:72 -> a
+    9:9:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    9:9:void hideMatches(com.android.tools.r8.graph.DexMethod):70 -> a
+    10:10:void addDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):78:78 -> a
+    11:38:java.util.List createCandidatesList():83:110 -> a
+    39:39:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    39:39:java.util.List createCandidatesList():110 -> a
+    40:40:java.util.List createCandidatesList():112:112 -> a
+    41:41:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    41:41:java.util.List createCandidatesList():110 -> a
+    42:42:java.util.List createCandidatesList():116:116 -> a
     1:8:java.util.List createFullList():123:130 -> b
     1:3:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection wrapInCollection():136:138 -> c
 com.android.tools.r8.ir.desugar.DefaultMethodsHelper$1 -> com.android.tools.r8.D.d.n:
@@ -30551,89 +30621,111 @@
     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
+    1:1:void <clinit>():59:59 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):68:68 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView):66:71 -> <init>
+    1:1:void desugar(com.android.tools.r8.ir.code.IRCode):76:76 -> a
+    2:17:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):119:134 -> a
+    2:17:void desugar(com.android.tools.r8.ir.code.IRCode):80 -> a
+    18:36:void generateCallBack(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):173:191 -> a
+    18:36:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):134 -> a
+    18:36:void desugar(com.android.tools.r8.ir.code.IRCode):80 -> a
+    37:38:void addCallBackSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):196:197 -> a
+    37:38:void generateCallBack(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):192 -> a
+    37:38:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):134 -> a
+    37:38:void desugar(com.android.tools.r8.ir.code.IRCode):80 -> a
+    39:43:void desugar(com.android.tools.r8.ir.code.IRCode):82:86 -> a
+    44:44:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    44:44:void desugar(com.android.tools.r8.ir.code.IRCode):87 -> a
+    45:61:void desugar(com.android.tools.r8.ir.code.IRCode):88:104 -> a
+    62:73:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):262:273 -> a
+    62:73:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    74:75:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):390:391 -> a
+    74:75:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):276 -> a
+    74:75:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    76:76:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414:414 -> a
+    76:76:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):391 -> a
+    76:76:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):276 -> a
+    76:76:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    77:77:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    77:77:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414 -> a
+    77:77:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):391 -> a
+    77:77:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):276 -> a
+    77:77:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    78:78:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    78:78:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414 -> a
+    78:78:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):391 -> a
+    78:78:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):276 -> a
+    78:78:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    79:81:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):392:394 -> a
+    79:81:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):276 -> a
+    79:81:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    82:105:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):279:302 -> a
+    82:105:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    106:109:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):381:384 -> a
+    106:109:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):304 -> a
+    106:109:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    110:110:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414:414 -> a
+    110:110:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):384 -> a
+    110:110:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):304 -> a
+    110:110:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    111:111:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    111:111:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414 -> a
+    111:111:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):384 -> a
+    111:111:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):304 -> a
+    111:111:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    112:112:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    112:112:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414 -> a
+    112:112:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):384 -> a
+    112:112:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):304 -> a
+    112:112:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    113:113:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):385:385 -> a
+    113:113:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):304 -> a
+    113:113:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    114:135:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):303:324 -> a
+    114:135:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    136:136:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):66:66 -> a
+    136:136:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):320 -> a
+    136:136:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    137:138:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):326:327 -> a
+    137:138:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    139:139:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):326:326 -> a
+    139:139:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    140:140:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    140:140:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):330 -> a
+    140:140:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    141:142:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):331:332 -> a
+    141:142:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    143:143:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    143:143:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):333 -> a
+    143:143:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    144:144:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):335:335 -> a
+    144:144:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    145:145:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    145:145:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):336 -> a
+    145:145:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    146:148:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):337:339 -> a
+    146:148:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    149:149:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    149:149:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):340 -> a
+    149:149:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    150:151:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):345:346 -> a
+    150:151:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    152:175:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):140:163 -> a
+    176:190:com.android.tools.r8.graph.DexMethod methodWithVivifiedTypeInSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):202:216 -> a
+    191:195:void generateWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):222:226 -> a
+    196:200:void warnInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.lang.String):231:235 -> a
+    201:201:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):251:251 -> a
+    202:202:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    202:202:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):252 -> a
+    203:203:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):252:252 -> a
+    204:204:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    204:204:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):252 -> a
+    205:205:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):253:253 -> a
+    206:223:void splitIfCatchHandlers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):355:372 -> a
+    224:234:com.android.tools.r8.graph.DexMethod createConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):400:410 -> a
+    235:235:com.android.tools.r8.graph.DexMethod createConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):409:409 -> a
+    236:237:boolean canConvert(com.android.tools.r8.graph.DexType):418:419 -> a
 com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration -> com.android.tools.r8.D.d.s:
     java.util.Map rewritePrefix -> b
     java.util.Map emulateLibraryInterface -> c
@@ -30674,12 +30766,12 @@
     7:7:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder addDontRewriteInvocation(java.lang.String):181:181 -> a
     8:8:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> a
     8:8:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):173 -> a
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     9:9:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> a
     9:9:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):173 -> a
     10:10:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> a
     10:10:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):174 -> a
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     11:11:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> a
     11:11:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):174 -> a
     12:12:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):175:175 -> a
@@ -30687,34 +30779,34 @@
     1:1:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder setLibraryCompilation():136:136 -> b
     2:2:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> b
     2:2:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):154 -> b
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
     3:3:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> b
     3:3:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):154 -> b
     4:4:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> b
     4:4:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):155 -> b
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
     5:5:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> b
     5:5:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):155 -> b
     6:6:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):156:156 -> b
     7:7:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> b
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
     8:8:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> b
     1:1:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder setProgramCompilation():131:131 -> c
     2:2:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> c
     2:2:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):147 -> c
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> c
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> c
     3:3:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> c
     3:3:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):147 -> c
     4:4:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> c
     4:4:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):148 -> c
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> c
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> c
     5:5:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> c
     5:5:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):148 -> c
     6:6:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):149:149 -> c
     1:5:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):161:165 -> d
     6:6:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> d
     6:6:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):166 -> d
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> d
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> d
     7:7:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> d
     7:7:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):166 -> d
     8:9:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):167:168 -> d
@@ -30777,80 +30869,98 @@
     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
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter):116:116 -> <init>
+    2:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter):103:119 -> <init>
+    1:5:boolean canGenerateWrapper(com.android.tools.r8.graph.DexType):135:139 -> 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):170:170 -> 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
+    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):170 -> a
+    8:34:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):170:196 -> a
+    35:36:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):187:188 -> a
+    37:39:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
+    37:39:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):190 -> a
+    40:40:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):198:198 -> a
+    41:41: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):176:176 -> a
+    42:42:com.android.tools.r8.graph.DexType createWrapperType(com.android.tools.r8.graph.DexType,java.lang.String):155:155 -> a
+    42: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):177 -> a
+    43:43:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    43:43:com.android.tools.r8.graph.DexType createWrapperType(com.android.tools.r8.graph.DexType,java.lang.String):157 -> a
+    43:43:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):177 -> a
+    44:44:com.android.tools.r8.graph.DexType createWrapperType(com.android.tools.r8.graph.DexType,java.lang.String):157:157 -> a
+    44:44:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):177 -> a
+    45:45:com.android.tools.r8.graph.DexType createWrapperType(com.android.tools.r8.graph.DexType,java.lang.String):156:156 -> a
+    45:45:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):177 -> a
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    46:46:com.android.tools.r8.graph.DexType createWrapperType(com.android.tools.r8.graph.DexType,java.lang.String):155 -> a
+    46:46:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):177 -> a
+    47:48:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):178:179 -> a
+    49:49:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):206:206 -> a
+    50:54:com.android.tools.r8.graph.DexEncodedField synthesizeWrappedValueField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):434:438 -> a
+    50:54:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):207 -> a
+    55:55:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):202:202 -> a
+    55:55:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):209 -> a
+    56:56:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):211:211 -> a
+    57:93:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):306:342 -> a
+    57:93:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):211 -> a
+    94:99:com.android.tools.r8.graph.DexEncodedMethod[] finalizeWrapperMethods(java.util.List,java.util.Set):349:354 -> a
+    94:99:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):344 -> a
+    94:99:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):211 -> a
+    100:100:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):208:208 -> a
+    101:118: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):232:249 -> a
+    119:122:com.android.tools.r8.graph.DexEncodedMethod synthesizeConstructor(com.android.tools.r8.graph.DexField):442:445 -> a
+    119:122: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):253 -> a
+    123:131:com.android.tools.r8.graph.DexEncodedMethod synthesizeConstructor(com.android.tools.r8.graph.DexField):443:451 -> a
+    123:131: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):253 -> a
+    132:137:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):456:461 -> a
+    132:137:com.android.tools.r8.graph.DexEncodedMethod synthesizeConstructor(com.android.tools.r8.graph.DexField):447 -> a
+    132:137: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):253 -> a
+    138:142: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):253:257 -> a
+    143:143:java.lang.String lambda$reportFinalMethodsInWrapper$1(com.android.tools.r8.graph.DexMethod):359:359 -> a
+    144:144:java.lang.String[] lambda$reportFinalMethodsInWrapper$2(int):359:359 -> a
+    145:154:void reportFinalMethodsInWrapper(java.util.Set):359:368 -> a
+    155:155:void reportFinalMethodsInWrapper(java.util.Set):363:363 -> a
+    156:164: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):374:382 -> a
+    165:202:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexLibraryClass):387:424 -> a
+    203:205:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):473:475 -> a
+    206:206: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):490:490 -> a
+    207:211:boolean verifyAllClassesGenerated():501:505 -> a
+    207:211: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):490 -> a
+    212: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):491:494 -> a
+    216:217:void registerSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexApplication$Builder):512:513 -> a
+    216: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):495 -> a
+    218:218: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):496:496 -> a
+    219:221:void generateTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):517:519 -> a
+    222:222:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):202:202 -> a
+    222:222:void generateTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):524 -> a
+    223:223:void generateTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):525:525 -> a
+    224:224:void generateTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):520:520 -> a
+    225:225:void generateTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):519:519 -> a
+    226:228: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):545:547 -> a
+    229:253: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):546:570 -> a
+    254:259:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):456:461 -> a
+    254: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):572 -> a
+    1:1:com.android.tools.r8.graph.DexType getTypeWrapper(com.android.tools.r8.graph.DexType):143:143 -> b
+    2:2:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):217:217 -> b
+    3:3:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):202:202 -> b
+    3:3:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):219 -> b
+    4:8:com.android.tools.r8.graph.DexEncodedField synthesizeWrappedValueField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):434:438 -> b
+    4:8:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):219 -> b
+    9:9:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):223:223 -> b
+    10:47:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):262:299 -> b
+    10:47:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):223 -> b
+    48:53:com.android.tools.r8.graph.DexEncodedMethod[] finalizeWrapperMethods(java.util.List,java.util.Set):349:354 -> b
+    48:53:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):301 -> b
+    48:53:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):223 -> b
+    54:54:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):220:220 -> b
+    55:56:void generateVivifiedTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):529:530 -> b
+    57:57:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):202:202 -> b
+    57:57:void generateVivifiedTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):534 -> b
+    58:58:void generateVivifiedTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):536:536 -> b
+    59:59:void generateVivifiedTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):531:531 -> b
+    60:60:void generateVivifiedTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):530:530 -> b
+    1:1:com.android.tools.r8.graph.DexType getVivifiedTypeWrapper(com.android.tools.r8.graph.DexType):147:147 -> c
+    1:1:boolean hasSynthesized(com.android.tools.r8.graph.DexType):127:127 -> d
+    1:1:boolean isSynthesizedWrapper(com.android.tools.r8.graph.DexType):123:123 -> e
 com.android.tools.r8.ir.desugar.InterfaceMethodRewriter -> com.android.tools.r8.D.d.w:
     java.util.concurrent.ConcurrentHashMap nearestEmulatedInterfaceCache -> g
     java.util.Set synthesizedMethods -> h
@@ -30871,10 +30981,10 @@
     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:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     16:16:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):161 -> a
     17:24:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):159:166 -> a
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     25:25:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):165 -> a
     26:26:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):163:163 -> a
     27:36:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):177:186 -> a
@@ -30933,7 +31043,7 @@
     220:220:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
     220:220:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):314 -> a
     221:269:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):314:362 -> a
-    270:270:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    270:270:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     270:270:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):362 -> a
     271:283:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):362:374 -> a
     284:284:java.util.Set lambda$rewriteMethodReferences$0(com.android.tools.r8.graph.DexLibraryClass):236:236 -> a
@@ -30967,10 +31077,10 @@
     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 com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     388:388:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):779 -> a
     389:393:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):788:792 -> a
-    394:394:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    394:394:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     394:394:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):792 -> a
     395:404:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):837:846 -> a
     405:405:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):843:843 -> a
@@ -30980,105 +31090,105 @@
     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:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     413:413:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):964 -> a
     414:417:java.util.Map processEmulatedInterfaceHierarchy():575:578 -> a
     414:417:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):556 -> a
     414:417:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     418:425:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):557:564 -> a
     418:425:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    426:426:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):636:636 -> a
+    426:426:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):636:636 -> a
     426:426:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     426:426:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     427:427:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    427:427:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):637 -> a
+    427:427:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):637 -> a
     427:427:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     427:427:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    428:432:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):637:641 -> a
+    428:432:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):637:641 -> a
     428:432:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     428:432:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    433:439:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):640:646 -> a
+    433:439:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):640:646 -> a
     433:439:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     433:439:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     440:440:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
-    440:440:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648 -> a
+    440:440:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648 -> a
     440:440:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     440:440:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    441:441:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648:648 -> a
+    441:441:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648:648 -> a
     441:441:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     441:441:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    442:461:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):647:666 -> a
+    442:461:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):647:666 -> a
     442:461:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     442:461:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     462:470:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):612:620 -> a
-    462:470:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666 -> a
+    462:470:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666 -> a
     462:470:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     462:470:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    471:475:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:671 -> a
+    471:475:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:671 -> a
     471:475:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     471:475:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    476:478:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):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:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1264:1266 -> a
+    476:478:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672 -> a
     476:478:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     476:478:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    479:479:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672:672 -> a
+    479:479:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672:672 -> a
     479:479:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     479:479:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    480:480:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):670:670 -> a
+    480:480:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):670:670 -> a
     480:480:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     480:480:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    481:481:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:667 -> a
+    481:481:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:667 -> a
     481:481:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     481:481:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    482:482:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):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:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1264:1264 -> a
+    482:482:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672 -> a
     482:482:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     482:482:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    483:489:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):680:686 -> a
+    483:489:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):680:686 -> a
     483:489:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     483:489:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     490:490:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
-    490:490:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690 -> a
+    490:490:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690 -> a
     490:490:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     490:490:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    491:491:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690:690 -> a
+    491:491:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690:690 -> a
     491:491:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     491:491:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    492: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:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1264:1266 -> a
+    492:494:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691 -> a
     492:494:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     492:494:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    495:495:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691:691 -> a
+    495:495:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691:691 -> a
     495:495:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     495:495:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    496:496:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):689:689 -> a
+    496:496:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):689:689 -> a
     496:496:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     496:496:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    497:497:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):686:686 -> a
+    497:497:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):686:686 -> a
     497:497:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     497:497:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    498:498:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):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:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1264:1264 -> a
+    498:498:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691 -> a
     498:498:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     498:498:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    499:499:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:697 -> a
+    499:499:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:697 -> a
     499:499:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     499:499:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     500: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:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699 -> a
     500:502:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     500:502:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     503:503:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):628:628 -> a
-    503:503:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699 -> a
+    503:503:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699 -> a
     503:503:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     503:503:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    504:504:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699:699 -> a
+    504:504:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699:699 -> a
     504:504:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     504:504:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    505:505:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):698:698 -> a
+    505:505:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):698:698 -> a
     505:505:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     505:505:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    506:547:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:738 -> a
+    506:547:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:738 -> a
     506:547:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     506:547:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     548:548:boolean isInMainDexList(com.android.tools.r8.graph.DexType):815:815 -> a
@@ -31087,7 +31197,7 @@
     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):637 -> a
+    551:551:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):637 -> a
     551:551:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     551:551:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     552:560:void duplicateEmulatedInterfaces():936:944 -> a
@@ -31129,7 +31239,7 @@
     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:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     615:615:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):986 -> a
     616:617:void renameEmulatedInterfaces():881:882 -> a
     616:617:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
@@ -31149,7 +31259,7 @@
     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 com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     632:632:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):916 -> a
     632:632:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
     632:632:void renameEmulatedInterfaces():883 -> a
@@ -31210,13 +31320,13 @@
     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 com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> b
     3:3:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528 -> b
     4:8:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528:532 -> b
     9:10:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):748:749 -> b
     11:11:java.lang.String getEmulateLibraryInterfaceClassDescriptor(java.lang.String):742:742 -> b
     11:11:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):750 -> b
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
     12:12:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):751 -> b
     13:13:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875:875 -> b
     14:14:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):871:871 -> b
@@ -31226,7 +31336,7 @@
     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 com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> c
     8:8:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):811 -> c
     9:9:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> c
     10:10:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> c
@@ -31332,7 +31442,7 @@
     2:40:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):65:103 -> <init>
     41:47:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):101:107 -> <init>
     1:21:com.android.tools.r8.graph.DexType createLambdaClassType(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):113:133 -> a
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     22:22:com.android.tools.r8.graph.DexType createLambdaClassType(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):133 -> a
     23:23:com.android.tools.r8.graph.DexProgramClass getOrCreateLambdaClass():137:137 -> a
     24:25:com.android.tools.r8.graph.DexField getCaptureField(int):184:185 -> a
@@ -31402,14 +31512,20 @@
 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
+    1:6:boolean ensureAccessibility():632:637 -> a
+    7:7:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    7:7:boolean ensureAccessibility():638 -> a
+    8:22:boolean ensureAccessibility():641:655 -> a
 com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.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
+    1:6:boolean ensureAccessibility():584:589 -> a
+    7:7:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    7:7:boolean ensureAccessibility():590 -> a
+    8:25:boolean ensureAccessibility():593:610 -> a
+    26:33:boolean ensureAccessibility():609:616 -> a
 com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.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
@@ -31509,7 +31625,7 @@
     14:46:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):82:114 -> a
     47:47:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57:57 -> a
     47:47:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):121 -> a
-    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):434:434 -> a
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):435:435 -> a
     48:48:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57 -> a
     48:48:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):121 -> a
     49:58:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):122:131 -> a
@@ -31519,12 +31635,12 @@
     62:62:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):229:229 -> a
     63:63:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():513:513 -> a
     63:63:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
-    64:64:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    64:64:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     64:64:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():513 -> a
     64:64:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
     65:65:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():522:522 -> a
     65:65:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
-    66:66:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    66:66:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     66:66:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():522 -> a
     66:66:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
     67:77:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():522:532 -> a
@@ -31536,7 +31652,7 @@
     95:112:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):289:306 -> a
     113:113:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57:57 -> a
     113:113:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
-    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):434:434 -> a
+    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):435:435 -> a
     114:114:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57 -> a
     114:114:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
     115:156:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):310:351 -> a
@@ -31605,100 +31721,111 @@
     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
+    28:38:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):152:162 -> a
+    39:40:com.android.tools.r8.ir.desugar.LambdaClass getKnownLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):333:334 -> a
+    39:40:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):163 -> a
+    41:42:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):164:165 -> a
+    43:54:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):377:388 -> a
+    43:54:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    55:55:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    55:55:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):388 -> a
+    55:55:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    56:56:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    56:56:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):387 -> a
+    56:56:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    57:90:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):390:423 -> a
+    57:90:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    91:91:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):40:40 -> a
+    91:91:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):423 -> a
+    91:91:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    92:92:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    92:92:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):425 -> a
+    92:92:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    93:96:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):426:429 -> a
+    93:96:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    97:97:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    97:97:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):435 -> a
+    97:97:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    98:112:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):436:450 -> a
+    98:112:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    113:114:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getCreateInstanceMethod():141:142 -> a
+    113:114:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):452 -> a
+    113:114:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    115:116:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):452:453 -> a
+    115:116:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    117:118:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):174:175 -> a
+    119:119:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    119:119:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):175 -> a
+    120:122:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):175:177 -> a
+    123:130:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):185:192 -> a
+    131:141:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):465:475 -> a
+    131:141:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    142:142:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    142:142:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):475 -> a
+    142:142:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    143:143:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    143:143:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):474 -> a
+    143:143:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    144:161:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):480:497 -> a
+    144:161:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    162:163:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getCreateInstanceMethod():141:142 -> a
+    162:163:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):499 -> a
+    162:163:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    164:165:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):499:500 -> a
+    164:165:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    166:168:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):200:202 -> a
+    169:169:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):201:201 -> a
+    170:178:boolean removeLambdaDeserializationMethods(java.lang.Iterable):210:218 -> a
+    179:179:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):194:194 -> a
+    179:179:boolean removeLambdaDeserializationMethods(java.lang.Iterable):218 -> a
+    180:182:boolean removeLambdaDeserializationMethods(java.lang.Iterable):219:221 -> a
+    183:189:void adjustAccessibility():237:243 -> a
+    190:190:void adjustAccessibility():242:242 -> a
+    191:192:com.android.tools.r8.graph.DexProgramClass getLambdaClass(com.android.tools.r8.graph.DexType):252:253 -> a
+    193:202:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):259:268 -> a
+    203:203:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):265:265 -> a
+    204:208:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):287:291 -> a
+    209:215:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):358:364 -> a
+    209:215:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):290 -> a
+    216:216:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):290:290 -> a
+    217:217:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):365:365 -> a
+    217:217:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):290 -> a
+    218:222:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):301:305 -> a
+    223:229:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):358:364 -> a
+    223:229:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306 -> a
+    230:234:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306:310 -> a
+    235:235:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
+    235:235:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):310 -> a
+    236:243:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):311:318 -> a
+    244:244:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    244:244:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):338 -> a
+    244:244:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    245:245:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    245:245:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):339 -> a
+    245:245:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    246:246:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):340:340 -> a
+    246:246:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    247:247:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    247:247:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):341 -> a
+    247:247:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    248:254:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):342:348 -> a
+    248:254:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    255:255:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):347:347 -> a
+    255:255:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    256:256:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    256:256:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):346 -> a
+    256:256:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    257:257:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):344:344 -> a
+    257:257:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    258:258:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):365:365 -> a
+    258:258:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306 -> a
+    259:259:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):325:325 -> a
+    260:260:boolean isInMainDexList(com.android.tools.r8.graph.DexType):295:295 -> a
+    260:260:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):326 -> a
+    261:261:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):327:327 -> a
+    262:264:java.lang.Object getKnown(java.util.Map,java.lang.Object):352:354 -> a
     1:1:boolean hasLambdaClassPrefix(com.android.tools.r8.graph.DexType):91:91 -> b
-    2:4:java.util.Set getDesugaredCallSites():269:271 -> b
+    2:4:java.util.Set getDesugaredCallSites():273:275 -> b
 com.android.tools.r8.ir.desugar.LambdaRewriter$1 -> com.android.tools.r8.D.d.L:
     com.android.tools.r8.ir.conversion.LensCodeRewriter val$lensCodeRewriter -> c
     com.android.tools.r8.ir.desugar.LambdaRewriter this$0 -> e
@@ -31728,7 +31855,7 @@
     1:1:com.android.tools.r8.graph.DexType getNestConstructorType():71:71 -> a
     2:2:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):79:79 -> a
     3:3:java.util.concurrent.Future asyncProcessNest(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService):112:112 -> a
-    4:6:void synthetizeNestConstructor(com.android.tools.r8.graph.DexApplication$Builder):171:173 -> a
+    4:6:void synthesizeNestConstructor(com.android.tools.r8.graph.DexApplication$Builder):171:173 -> a
     7:14:boolean invokeRequiresRewriting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):244:251 -> a
     15:22:boolean fieldAccessRequiresRewriting(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):255:262 -> a
     23:24:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):282:283 -> a
@@ -31744,33 +31871,33 @@
     61:66:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):301:306 -> a
     67:68:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):219:220 -> a
     67:68:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    69:69:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1275:1275 -> a
+    69:69:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1278:1278 -> a
     69:69:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     69:69:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     70:70:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    70:70:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1275 -> a
+    70:70:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1278 -> a
     70:70:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     70:70:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    71:71:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1275:1275 -> a
+    71:71:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1278:1278 -> a
     71:71:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     71:71:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     72:72:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    72:72:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1277 -> a
+    72:72:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1280 -> a
     72:72:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     72:72:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    73:76:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1276:1279 -> a
+    73:76:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1279:1282 -> a
     73:76:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     73:76:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     77:77:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):221:221 -> a
     77:77:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    78:78:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1275:1275 -> a
+    78:78:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1278:1278 -> a
     78:78:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     78:78:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     79:86:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):308:315 -> a
     87:89:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureInvokeBridge$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):318:320 -> a
     1:14:java.util.List extractNest(com.android.tools.r8.graph.DexClass):94:107 -> b
     15:16:com.android.tools.r8.graph.DexProgramClass createNestAccessConstructor():148:149 -> b
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
     17:17:com.android.tools.r8.graph.DexProgramClass createNestAccessConstructor():149 -> b
     18:36:com.android.tools.r8.graph.DexProgramClass createNestAccessConstructor():149:167 -> b
     37:37:void com.android.tools.r8.graph.DexProgramClass.<init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):70:70 -> b
@@ -31927,8 +32054,8 @@
     2:4:void <init>(com.android.tools.r8.graph.AppView):34:36 -> <init>
     boolean shouldProcessClassInNest(com.android.tools.r8.graph.DexClass,java.util.List) -> a
     1:1:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:44 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1048 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1050 -> a
     2:2:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44 -> a
     3:4:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:45 -> a
     5:5:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:44 -> a
@@ -32045,7 +32172,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):959:959 -> a
+    13:13:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     13:13:void desugar():343 -> a
     14:14:void desugar():344:344 -> a
     15:16:void appendInstruction(com.android.tools.r8.ir.code.Instruction):308:309 -> a
@@ -32061,7 +32188,7 @@
     26:26:void com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk.addAppendCall(com.android.tools.r8.ir.code.Value):413:413 -> a
     26:26:void desugar():352 -> a
     27:36:void desugar():356:365 -> a
-    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     37:37:void desugar():365 -> a
     38:39:void desugar():369:370 -> a
     40:70:void desugar():369:399 -> a
@@ -32080,7 +32207,7 @@
     java.lang.String str -> c
     1:3:void <init>(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder,java.lang.String,com.android.tools.r8.graph.DexMethod):436:438 -> <init>
     1:2:com.android.tools.r8.ir.code.Value getOrCreateValue():443:444 -> a
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     3:3:com.android.tools.r8.ir.code.Value getOrCreateValue():444 -> a
     4:8:com.android.tools.r8.ir.code.Value getOrCreateValue():445:449 -> a
     9:9:com.android.tools.r8.ir.code.Value getOrCreateValue():445:445 -> a
@@ -32112,34 +32239,34 @@
     14:19:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):122:127 -> a
     20:38:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):237:255 -> a
     20:38:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     39:39:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):262 -> a
     39:39:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     40:40:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):262:262 -> a
     40:40:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     41:41:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):266 -> a
     41:41:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     42:42:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):266:266 -> a
     42:42:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     43:43:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):270 -> a
     43:43:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     44:44:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):270:270 -> a
     44:44:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     45:45:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):271 -> a
     45:45:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     46:47:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):271:272 -> a
     46:47:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     48:48:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):269:269 -> a
     48:48:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     49:49:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):280 -> a
     49:49:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     50:50:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):280:280 -> a
     50:50:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     51:51:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):282 -> a
     51:51:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     52:52:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):282:282 -> a
@@ -32148,27 +32275,27 @@
     53:55:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     56:62:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):279:285 -> a
     56:62:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     63:63:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):287 -> a
     63:63:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     64:64:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):287:287 -> a
     64:64:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     65:65:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):291 -> a
     65:65:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     66:66:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):291:291 -> a
     66:66:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    67:67:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    67:67:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     67:67:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):293 -> a
     67:67:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     68:68:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):293:293 -> a
     68:68:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     69:69:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):294 -> a
     69:69:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     70:70:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):294:294 -> a
     70:70:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     71:71:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):295 -> a
     71:71:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     72:72:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):295:295 -> a
@@ -32177,27 +32304,27 @@
     73:77:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     78:78:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):290:290 -> a
     78:78:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     79:79:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):303 -> a
     79:79:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     80:80:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):303:303 -> a
     80:80:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     81:81:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):307 -> a
     81:81:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     82:82:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):307:307 -> a
     82:82:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     83:83:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):309 -> a
     83:83:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     84:84:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):309:309 -> a
     84:84:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    85:85:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    85:85:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     85:85:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):310 -> a
     85:85:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     86:86:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):310:310 -> a
     86:86:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    87:87:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    87:87:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     87:87:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):311 -> a
     87:87:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     88:88:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):311:311 -> a
@@ -32206,34 +32333,34 @@
     89:93:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     94:94:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):306:306 -> a
     94:94:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     95:95:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):320 -> a
     95:95:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     96:96:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):320:320 -> a
     96:96:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     97:97:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):322 -> a
     97:97:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     98:98:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):322:322 -> a
     98:98:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    99:99:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    99:99:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     99:99:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):327 -> a
     99:99:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     100:100:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):327:327 -> a
     100:100:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     101:101:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):328 -> a
     101:101:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     102:103:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):328:329 -> a
     102:103:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     104:104:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):326:326 -> a
     104:104:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    105:105:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    105:105:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     105:105:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):335 -> a
     105:105:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     106:106:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):335:335 -> a
     106:106:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    107:107:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    107:107:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     107:107:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):337 -> a
     107:107:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     108:108:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):337:337 -> a
@@ -32242,17 +32369,17 @@
     109:111:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     112:112:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):334:334 -> a
     112:112:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     113:113:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):343 -> a
     113:113:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     114:114:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):343:343 -> a
     114:114:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    115:115:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    115:115:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     115:115:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):345 -> a
     115:115:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     116:116:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):345:345 -> a
     116:116:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    117:117:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    117:117:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     117:117:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):346 -> a
     117:117:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     118:118:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):346:346 -> a
@@ -32261,17 +32388,17 @@
     119:122:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     123:130:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):342:349 -> a
     123:130:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    131:131:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    131:131:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     131:131:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):353 -> a
     131:131:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     132:132:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):353:353 -> a
     132:132:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    133:133:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    133:133:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     133:133:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):355 -> a
     133:133:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     134:134:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):355:355 -> a
     134:134:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    135:135:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    135:135:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     135:135:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):356 -> a
     135:135:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     136:136:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):356:356 -> a
@@ -32280,12 +32407,12 @@
     137:140:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     141:141:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):352:352 -> a
     141:141:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     142:142:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):362 -> a
     142:142:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     143:143:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):362:362 -> a
     143:143:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    144:144:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    144:144:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     144:144:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):364 -> a
     144:144:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     145:145:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):364:364 -> a
@@ -32294,22 +32421,22 @@
     146:148:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     149:149:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):361:361 -> a
     149:149:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    150:150:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    150:150:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     150:150:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):371 -> a
     150:150:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     151:151:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):371:371 -> a
     151:151:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    152:152:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    152:152:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     152:152:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):373 -> a
     152:152:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     153:153:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):373:373 -> a
     153:153:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    154:154:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    154:154:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     154:154:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):374 -> a
     154:154:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     155:155:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):374:374 -> a
     155:155:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    156:156:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    156:156:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     156:156:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):375 -> a
     156:156:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     157:157:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):375:375 -> a
@@ -32318,39 +32445,39 @@
     158:162:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     163:163:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):370:370 -> a
     163:163:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     164:164:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):382 -> a
     164:164:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     165:165:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):382:382 -> a
     165:165:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    166:166:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    166:166:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     166:166:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):384 -> a
     166:166:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     167:167:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):384:384 -> a
     167:167:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    168:168:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    168:168:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     168:168:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):389 -> a
     168:168:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     169:169:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):389:389 -> a
     169:169:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    170:170:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    170:170:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     170:170:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):390 -> a
     170:170:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     171:172:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):390:391 -> a
     171:172:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     173:178:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):388:393 -> a
     173:178:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    179:179:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    179:179:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     179:179:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):397 -> a
     179:179:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     180:180:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):397:397 -> a
     180:180:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    181:181:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    181:181:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     181:181:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):399 -> a
     181:181:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     182:182:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):399:399 -> a
     182:182:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    183:183:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    183:183:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     183:183:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):400 -> a
     183:183:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     184:184:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):400:400 -> a
@@ -32359,12 +32486,12 @@
     185:188:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     189:189:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):396:396 -> a
     189:189:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    190:190:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    190:190:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     190:190:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):407 -> a
     190:190:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     191:191:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):407:407 -> a
     191:191:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    192:192:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    192:192:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     192:192:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):409 -> a
     192:192:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     193:193:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):409:409 -> a
@@ -32373,17 +32500,17 @@
     194:196:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     197:197:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):406:406 -> a
     197:197:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    198:198:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    198:198:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     198:198:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):415 -> a
     198:198:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     199:199:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):415:415 -> a
     199:199:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    200:200:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    200:200:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     200:200:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):417 -> a
     200:200:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     201:201:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):417:417 -> a
     201:201:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    202:202:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    202:202:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     202:202:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):418 -> a
     202:202:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     203:203:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):418:418 -> a
@@ -32392,12 +32519,12 @@
     204:207:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     208:208:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):414:414 -> a
     208:208:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    209:209:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    209:209:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     209:209:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):424 -> a
     209:209:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     210:210:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):424:424 -> a
     210:210:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    211:211:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    211:211:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     211:211:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):426 -> a
     211:211:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     212:212:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):426:426 -> a
@@ -32406,22 +32533,22 @@
     213:215:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     216:216:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):423:423 -> a
     216:216:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    217:217:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    217:217:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     217:217:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):433 -> a
     217:217:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     218:218:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):433:433 -> a
     218:218:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    219:219:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    219:219:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     219:219:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):435 -> a
     219:219:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     220:220:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):435:435 -> a
     220:220:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    221:221:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    221:221:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     221:221:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):436 -> a
     221:221:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     222:222:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):436:436 -> a
     222:222:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    223:223:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    223:223:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     223:223:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):437 -> a
     223:223:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     224:224:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):437:437 -> a
@@ -32430,12 +32557,12 @@
     225:229:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     230:230:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):432:432 -> a
     230:230:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    231:231:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    231:231:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     231:231:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):448 -> a
     231:231:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     232:232:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):448:448 -> a
     232:232:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    233:233:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    233:233:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     233:233:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):450 -> a
     233:233:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     234:234:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):450:450 -> a
@@ -32446,37 +32573,37 @@
     238:238:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     239:239:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):259:259 -> a
     239:239:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     240:240:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):475 -> a
     240:240:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     241:243:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):474:476 -> a
     241:243:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    244:244:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    244:244:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     244:244:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):480 -> a
     244:244:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     245:246:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):480:481 -> a
     245:246:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    247:247:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    247:247:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     247:247:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):486 -> a
     247:247:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     248:250:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):485:487 -> a
     248:250:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    251:251:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    251:251:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     251:251:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):492 -> a
     251:251:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     252:254:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):491:493 -> a
     252:254:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    255:255:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    255:255:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     255:255:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):498 -> a
     255:255:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     256:258:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):497:499 -> a
     256:258:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    259:259:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    259:259:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     259:259:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):504 -> a
     259:259:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     260:263:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):503:506 -> a
     260:263:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    264:264:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    264:264:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     264:264:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):510 -> a
     264:264:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     265:266:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):510:511 -> a
@@ -32485,22 +32612,22 @@
     267:309:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     310:343:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):130:163 -> a
     344:344:boolean lambda$synthesizeUtilityClass$0(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexProgramClass):160:160 -> a
-    345:345:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    345:345:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     345:345:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):78 -> a
     346:362:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):79:95 -> a
     363:367:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):94:98 -> a
 com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.D.d.f0.a:
     1:4:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1541:1544 -> A
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> A
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> A
     5:5:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1561 -> A
     6:6:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1561:1561 -> A
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> A
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> A
     7:7:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1563 -> A
     8:8:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1563:1563 -> A
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> A
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> A
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1564 -> A
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1564:1564 -> A
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> A
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> A
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1565 -> A
     12:12:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1565:1565 -> A
     13:17:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1562:1566 -> A
@@ -32508,16 +32635,16 @@
     19:42:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1548:1571 -> A
     1:19:com.android.tools.r8.graph.CfCode ShortMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4833:4851 -> A0
     1:5:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1575:1579 -> B
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> B
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> B
     6:6:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1600 -> B
     7:7:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1600:1600 -> B
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> B
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> B
     8:8:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1602 -> B
     9:9:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1602:1602 -> B
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> B
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> B
     10:10:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1603 -> B
     11:11:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1603:1603 -> B
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> B
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> B
     12:12:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1604 -> B
     13:13:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1604:1604 -> B
     14:18:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1601:1605 -> B
@@ -32528,356 +32655,356 @@
     1:16:com.android.tools.r8.graph.CfCode ShortMethods_toUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4873:4888 -> C0
     1:18:com.android.tools.r8.graph.CfCode LongMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1717:1734 -> D
     1:12:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4892:4903 -> D0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     13:13:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4911 -> D0
     14:16:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4911:4913 -> D0
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     17:17:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4917 -> D0
     18:18:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4917:4917 -> D0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     19:19:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4919 -> D0
     20:20:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4919:4919 -> D0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     21:21:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4920 -> D0
     22:22:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4920:4920 -> D0
     23:26:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4918:4921 -> D0
     27:27:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4916:4916 -> D0
-    28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     28:28:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4925 -> D0
     29:29:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4925:4925 -> D0
-    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     30:30:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4930 -> D0
     31:31:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4930:4930 -> D0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     32:32:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4931 -> D0
     33:34:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4931:4932 -> D0
     35:35:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4929:4929 -> D0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     36:36:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4947 -> D0
     37:37:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4947:4947 -> D0
-    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     38:38:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4949 -> D0
     39:39:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4949:4949 -> D0
-    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     40:40:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4950 -> D0
     41:41:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4950:4950 -> D0
     42:45:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4948:4951 -> D0
     46:46:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4946:4946 -> D0
-    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     47:47:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4968 -> D0
     48:48:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4968:4968 -> D0
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     49:49:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4970 -> D0
     50:50:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4970:4970 -> D0
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     51:51:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4971 -> D0
     52:52:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4971:4971 -> D0
     53:56:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4969:4972 -> D0
     57:57:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4967:4967 -> D0
-    58:58:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    58:58:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     58:58:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4983 -> D0
     59:59:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4983:4983 -> D0
-    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     60:60:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4985 -> D0
     61:61:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4985:4985 -> D0
-    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     62:62:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4986 -> D0
     63:63:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4986:4986 -> D0
     64:67:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4984:4987 -> D0
     68:68:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4982:4982 -> D0
-    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     69:69:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4998 -> D0
     70:70:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4998:4998 -> D0
-    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> D0
+    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     71:71:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5000 -> D0
     72:72:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5000:5000 -> D0
     73:75:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4999:5001 -> D0
     76:76:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4997:4997 -> D0
     77:176:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4907:5006 -> D0
     1:3:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1738:1740 -> E
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E
     4:4:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1751 -> E
     5:5:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1751:1751 -> E
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E
     6:6:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1753 -> E
     7:7:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1753:1753 -> E
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E
     8:8:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1754 -> E
     9:9:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1754:1754 -> E
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E
     10:10:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1755 -> E
     11:11:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1755:1755 -> E
     12:16:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1752:1756 -> E
     17:17:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1750:1750 -> E
     18:35:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1744:1761 -> E
     1:11:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5010:5020 -> E0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     12:12:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5028 -> E0
     13:15:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5028:5030 -> E0
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     16:16:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5034 -> E0
     17:17:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5034:5034 -> E0
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     18:18:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5036 -> E0
     19:19:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5036:5036 -> E0
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     20:20:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5037 -> E0
     21:21:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5037:5037 -> E0
     22:25:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5035:5038 -> E0
     26:26:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5033:5033 -> E0
-    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     27:27:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5042 -> E0
     28:28:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5042:5042 -> E0
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     29:29:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5047 -> E0
     30:30:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5047:5047 -> E0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     31:31:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5048 -> E0
     32:33:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5048:5049 -> E0
     34:34:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5046:5046 -> E0
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     35:35:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5057 -> E0
     36:36:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5057:5057 -> E0
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     37:37:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5059 -> E0
     38:38:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5059:5059 -> E0
     39:41:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5058:5060 -> E0
     42:42:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5056:5056 -> E0
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     43:43:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5068 -> E0
     44:44:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5068:5068 -> E0
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     45:45:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5069 -> E0
     46:47:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5069:5070 -> E0
     48:48:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5067:5067 -> E0
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     49:49:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5079 -> E0
     50:50:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5079:5079 -> E0
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     51:51:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5081 -> E0
     52:52:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5081:5081 -> E0
     53:55:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5080:5082 -> E0
     56:56:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5078:5078 -> E0
-    57:57:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    57:57:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     57:57:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5084 -> E0
     58:58:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5084:5084 -> E0
-    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     59:59:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5088 -> E0
     60:60:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5088:5088 -> E0
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     61:61:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5090 -> E0
     62:62:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5090:5090 -> E0
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     63:63:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5091 -> E0
     64:64:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5091:5091 -> E0
     65:68:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5089:5092 -> E0
     69:69:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5087:5087 -> E0
-    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     70:70:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5100 -> E0
     71:71:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5100:5100 -> E0
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     72:72:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5101 -> E0
     73:74:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5101:5102 -> E0
     75:75:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5099:5099 -> E0
-    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     76:76:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5111 -> E0
     77:77:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5111:5111 -> E0
-    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     78:78:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5113 -> E0
     79:79:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5113:5113 -> E0
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     80:80:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5114 -> E0
     81:81:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5114:5114 -> E0
     82:85:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5112:5115 -> E0
     86:86:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5110:5110 -> E0
-    87:87:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    87:87:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     87:87:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5124 -> E0
     88:88:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5124:5124 -> E0
-    89:89:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    89:89:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     89:89:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5126 -> E0
     90:90:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5126:5126 -> E0
     91:93:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5125:5127 -> E0
     94:94:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5123:5123 -> E0
-    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     95:95:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5129 -> E0
     96:96:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5129:5129 -> E0
-    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     97:97:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5133 -> E0
     98:98:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5133:5133 -> E0
-    99:99:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    99:99:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     99:99:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5135 -> E0
     100:100:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5135:5135 -> E0
-    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     101:101:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5136 -> E0
     102:102:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5136:5136 -> E0
     103:106:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5134:5137 -> E0
     107:107:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5132:5132 -> E0
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     108:108:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5146 -> E0
     109:109:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5146:5146 -> E0
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> E0
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     110:110:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5148 -> E0
     111:111:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5148:5148 -> E0
     112:114:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5147:5149 -> E0
     115:115:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5145:5145 -> E0
     116:246:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5024:5154 -> E0
     1:23:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1766:1788 -> F
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     24:24:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1798 -> F
     25:25:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1798:1798 -> F
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     26:26:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1799 -> F
     27:28:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1799:1800 -> F
     29:29:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1797:1797 -> F
-    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     30:30:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1807 -> F
     31:33:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1807:1809 -> F
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     34:34:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1813 -> F
     35:35:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1813:1813 -> F
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     36:36:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1815 -> F
     37:37:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1815:1815 -> F
-    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     38:38:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1816 -> F
     39:39:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1816:1816 -> F
     40:43:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1814:1817 -> F
     44:44:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1812:1812 -> F
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     45:45:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1828 -> F
     46:48:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1828:1830 -> F
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     49:49:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1835 -> F
     50:50:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1835:1835 -> F
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     51:51:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1837 -> F
     52:52:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1837:1837 -> F
-    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     53:53:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1838 -> F
     54:54:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1838:1838 -> F
     55:58:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1836:1839 -> F
     59:59:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1834:1834 -> F
-    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     60:60:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1844 -> F
     61:61:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1844:1844 -> F
-    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     62:62:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1846 -> F
     63:63:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1846:1846 -> F
-    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     64:64:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1847 -> F
     65:65:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1847:1847 -> F
     66:69:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1845:1848 -> F
     70:70:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1843:1843 -> F
-    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     71:71:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1853 -> F
     72:72:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1853:1853 -> F
-    73:73:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    73:73:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     73:73:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1855 -> F
     74:74:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1855:1855 -> F
-    75:75:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    75:75:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     75:75:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1856 -> F
     76:76:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1856:1856 -> F
     77:80:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1854:1857 -> F
     81:81:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1852:1852 -> F
-    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     82:82:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1867 -> F
     83:83:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1867:1867 -> F
-    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     84:84:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1869 -> F
     85:85:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1869:1869 -> F
-    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     86:86:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1870 -> F
     87:87:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1870:1870 -> F
-    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     88:88:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1871 -> F
     89:89:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1871:1871 -> F
     90:94:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1868:1872 -> F
     95:95:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1866:1866 -> F
-    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     96:96:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1881 -> F
     97:97:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1881:1881 -> F
-    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     98:98:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1883 -> F
     99:99:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1883:1883 -> F
-    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     100:100:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1883 -> F
     101:101:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1883:1883 -> F
     102:104:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1882:1884 -> F
     105:105:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1880:1880 -> F
-    106:106:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    106:106:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     106:106:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1913 -> F
     107:107:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1913:1913 -> F
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     108:108:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1915 -> F
     109:109:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1915:1915 -> F
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     110:110:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1915 -> F
     111:111:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1915:1915 -> F
     112:114:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1914:1916 -> F
     115:115:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1912:1912 -> F
-    116:116:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    116:116:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     116:116:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1922 -> F
     117:117:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1922:1922 -> F
-    118:118:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    118:118:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     118:118:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1924 -> F
     119:119:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1924:1924 -> F
-    120:120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    120:120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     120:120:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1925 -> F
     121:121:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1925:1925 -> F
-    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     122:122:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1926 -> F
     123:123:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1926:1926 -> F
     124:128:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1923:1927 -> F
     129:129:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1921:1921 -> F
-    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     130:130:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1935 -> F
     131:131:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1935:1935 -> F
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     132:132:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1941 -> F
     133:133:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1941:1941 -> F
-    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     134:134:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1943 -> F
     135:135:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1943:1943 -> F
-    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     136:136:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1944 -> F
     137:137:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1944:1944 -> F
     138:141:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1942:1945 -> F
     142:142:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1940:1940 -> F
-    143:143:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    143:143:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     143:143:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1969 -> F
     144:144:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1969:1969 -> F
-    145:145:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    145:145:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     145:145:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1971 -> F
     146:146:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1971:1971 -> F
-    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     147:147:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1972 -> F
     148:148:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1972:1972 -> F
-    149:149:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    149:149:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     149:149:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1973 -> F
     150:150:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1973:1973 -> F
     151:155:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1970:1974 -> F
     156:156:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1968:1968 -> F
-    157:157:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    157:157:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     157:157:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1979 -> F
     158:160:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1979:1981 -> F
-    161:161:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    161:161:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     161:161:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1986 -> F
     162:162:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1986:1986 -> F
-    163:163:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    163:163:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     163:163:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1988 -> F
     164:164:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1988:1988 -> F
-    165:165:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    165:165:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     165:165:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1989 -> F
     166:166:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1989:1989 -> F
     167:170:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1987:1990 -> F
     171:171:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1985:1985 -> F
-    172:172:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    172:172:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     172:172:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1995 -> F
     173:173:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1995:1995 -> F
-    174:174:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    174:174:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     174:174:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1997 -> F
     175:175:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1997:1997 -> F
-    176:176:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> F
+    176:176:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     176:176:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1998 -> F
     177:177:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1998:1998 -> F
     178:181:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1996:1999 -> F
@@ -32885,171 +33012,171 @@
     183:410:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1792:2019 -> F
     1:101:com.android.tools.r8.graph.CfCode LongMethods_remainderUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2023:2123 -> G
     1:3:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2127:2129 -> H
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> H
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> H
     4:4:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2140 -> H
     5:5:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2140:2140 -> H
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> H
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> H
     6:6:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2142 -> H
     7:7:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2142:2142 -> H
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> H
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> H
     8:8:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2143 -> H
     9:9:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2143:2143 -> H
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> H
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> H
     10:10:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2144 -> H
     11:11:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2144:2144 -> H
     12:16:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2141:2145 -> H
     17:17:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2139:2139 -> H
     18:35:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2133:2150 -> H
     1:39:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2155:2193 -> I
-    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     40:40:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2206 -> I
     41:41:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2206:2206 -> I
-    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     42:42:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2208 -> I
     43:43:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2208:2208 -> I
-    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     44:44:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2209 -> I
     45:45:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2209:2209 -> I
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     46:46:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2210 -> I
     47:47:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2210:2210 -> I
     48:52:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2207:2211 -> I
     53:53:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2205:2205 -> I
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     54:54:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2226 -> I
     55:55:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2226:2226 -> I
-    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     56:56:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2244 -> I
     57:57:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2244:2244 -> I
-    58:58:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    58:58:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     58:58:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2246 -> I
     59:59:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2246:2246 -> I
-    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     60:60:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2246 -> I
     61:61:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2246:2246 -> I
     62:64:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2245:2247 -> I
     65:65:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2243:2243 -> I
-    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     66:66:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2267 -> I
     67:67:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2267:2267 -> I
-    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     68:68:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2269 -> I
     69:69:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2269:2269 -> I
-    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     70:70:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2270 -> I
     71:71:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2270:2270 -> I
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     72:72:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2271 -> I
     73:73:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2271:2271 -> I
     74:78:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2268:2272 -> I
     79:79:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2266:2266 -> I
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     80:80:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2311 -> I
     81:81:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2311:2311 -> I
-    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     82:82:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2313 -> I
     83:83:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2313:2313 -> I
-    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     84:84:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2314 -> I
     85:85:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2314:2314 -> I
-    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     86:86:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2315 -> I
     87:87:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2315:2315 -> I
     88:92:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2312:2316 -> I
     93:93:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2310:2310 -> I
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     94:94:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2337 -> I
     95:95:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2337:2337 -> I
-    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     96:96:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2339 -> I
     97:97:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2339:2339 -> I
-    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     98:98:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2340 -> I
     99:99:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2340:2340 -> I
-    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     100:100:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2341 -> I
     101:101:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2341:2341 -> I
     102:106:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2338:2342 -> I
     107:107:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2336:2336 -> I
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     108:108:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2366 -> I
     109:109:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2366:2366 -> I
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     110:110:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2368 -> I
     111:111:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2368:2368 -> I
-    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     112:112:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2369 -> I
     113:113:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2369:2369 -> I
-    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     114:114:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2370 -> I
     115:115:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2370:2370 -> I
     116:120:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2367:2371 -> I
     121:121:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2365:2365 -> I
-    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     122:122:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2382 -> I
     123:123:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2382:2382 -> I
-    124:124:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    124:124:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     124:124:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2393 -> I
     125:125:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2393:2393 -> I
-    126:126:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    126:126:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     126:126:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2395 -> I
     127:127:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2395:2395 -> I
-    128:128:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    128:128:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     128:128:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2396 -> I
     129:129:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2396:2396 -> I
-    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     130:130:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2397 -> I
     131:131:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2397:2397 -> I
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> I
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     132:132:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2398 -> I
     133:133:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2398:2398 -> I
     134:139:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2394:2399 -> I
     140:140:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2392:2392 -> I
     141:359:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2186:2404 -> I
     1:7:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2408:2414 -> J
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> J
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> J
     8:8:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2440 -> J
     9:9:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2440:2440 -> J
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> J
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> J
     10:10:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2445 -> J
     11:11:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2445:2445 -> J
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> J
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> J
     12:12:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2446 -> J
     13:14:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2446:2447 -> J
     15:15:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2444:2444 -> J
     16:50:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2418:2452 -> J
     1:10:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2456:2465 -> K
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> K
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> K
     11:11:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2504 -> K
     12:12:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2504:2504 -> K
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> K
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> K
     13:13:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2509 -> K
     14:14:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2509:2509 -> K
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> K
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> K
     15:15:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2510 -> K
     16:17:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2510:2511 -> K
     18:18:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2508:2508 -> K
     19:66:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2469:2516 -> K
     1:5:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2520:2524 -> L
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> L
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> L
     6:6:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2534 -> L
     7:7:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2534:2534 -> L
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> L
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> L
     8:8:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2539 -> L
     9:9:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2539:2539 -> L
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> L
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> L
     10:10:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2540 -> L
     11:12:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2540:2541 -> L
     13:13:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2538:2538 -> L
     14:37:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2528:2551 -> L
     1:5:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2555:2559 -> M
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> M
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> M
     6:6:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2570 -> M
     7:7:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2570:2570 -> M
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> M
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> M
     8:8:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2575 -> M
     9:9:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2575:2575 -> M
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> M
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> M
     10:10:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2576 -> M
     11:12:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2576:2577 -> M
     13:13:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2574:2574 -> M
@@ -33057,16 +33184,16 @@
     1:55:com.android.tools.r8.graph.CfCode MathMethods_floorDivInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2591:2645 -> N
     1:59:com.android.tools.r8.graph.CfCode MathMethods_floorDivLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2649:2707 -> O
     1:3:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2711:2713 -> P
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> P
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> P
     4:4:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2725 -> P
     5:5:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2725:2725 -> P
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> P
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> P
     6:6:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2727 -> P
     7:7:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2727:2727 -> P
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> P
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> P
     8:8:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2728 -> P
     9:9:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2728:2728 -> P
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> P
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> P
     10:10:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2729 -> P
     11:11:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2729:2729 -> P
     12:16:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2726:2730 -> P
@@ -33075,162 +33202,162 @@
     1:47:com.android.tools.r8.graph.CfCode MathMethods_floorModInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2739:2785 -> Q
     1:51:com.android.tools.r8.graph.CfCode MathMethods_floorModLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2789:2839 -> R
     1:3:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2843:2845 -> S
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> S
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> S
     4:4:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2857 -> S
     5:5:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2857:2857 -> S
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> S
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> S
     6:6:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2859 -> S
     7:7:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2859:2859 -> S
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> S
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> S
     8:8:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2860 -> S
     9:9:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2860:2860 -> S
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> S
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> S
     10:10:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2861 -> S
     11:11:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2861:2861 -> S
     12:16:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2858:2862 -> S
     17:17:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2856:2856 -> S
     18:37:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2849:2868 -> S
     1:5:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2872:2876 -> T
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> T
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> T
     6:6:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2886 -> T
     7:7:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2886:2886 -> T
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> T
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> T
     8:8:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2891 -> T
     9:9:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2891:2891 -> T
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> T
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> T
     10:10:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2892 -> T
     11:12:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2892:2893 -> T
     13:13:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2890:2890 -> T
     14:37:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2880:2903 -> T
     1:5:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2907:2911 -> U
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> U
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> U
     6:6:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2922 -> U
     7:7:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2922:2922 -> U
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> U
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> U
     8:8:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2927 -> U
     9:9:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2927:2927 -> U
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> U
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> U
     10:10:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2928 -> U
     11:12:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2928:2929 -> U
     13:13:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2926:2926 -> U
     14:38:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2915:2939 -> U
     1:7:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2943:2949 -> V
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> V
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> V
     8:8:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2975 -> V
     9:9:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2975:2975 -> V
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> V
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> V
     10:10:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2980 -> V
     11:11:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2980:2980 -> V
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> V
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> V
     12:12:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2981 -> V
     13:14:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2981:2982 -> V
     15:15:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2979:2979 -> V
     16:50:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2953:2987 -> V
     1:18:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2991:3008 -> W
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     19:19:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3019 -> W
     20:20:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3019:3019 -> W
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     21:21:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3021 -> W
     22:22:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3021:3021 -> W
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     23:23:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3021 -> W
     24:24:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3021:3021 -> W
     25:27:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3020:3022 -> W
     28:28:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3018:3018 -> W
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     29:29:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3031 -> W
     30:30:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3031:3031 -> W
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     31:31:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3033 -> W
     32:32:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3033:3033 -> W
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     33:33:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3033 -> W
     34:34:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3033:3033 -> W
     35:37:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3032:3034 -> W
     38:38:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3030:3030 -> W
-    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     39:39:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3042 -> W
     40:40:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3042:3042 -> W
-    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     41:41:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3044 -> W
     42:42:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3044:3044 -> W
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     43:43:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3044 -> W
     44:44:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3044:3044 -> W
     45:47:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3043:3045 -> W
     48:48:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3041:3041 -> W
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     49:49:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3055 -> W
     50:50:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3055:3055 -> W
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     51:51:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3057 -> W
     52:52:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3057:3057 -> W
-    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     53:53:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3057 -> W
     54:54:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3057:3057 -> W
     55:57:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3056:3058 -> W
     58:58:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3054:3054 -> W
-    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     59:59:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3115 -> W
     60:60:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3115:3115 -> W
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     61:61:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3120 -> W
     62:62:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3120:3120 -> W
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> W
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     63:63:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3121 -> W
     64:65:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3121:3122 -> W
     66:66:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3119:3119 -> W
     67:182:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3012:3127 -> W
     1:3:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3131:3133 -> X
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> X
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> X
     4:4:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3145 -> X
     5:5:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3145:3145 -> X
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> X
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> X
     6:6:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3147 -> X
     7:7:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3147:3147 -> X
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> X
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> X
     8:8:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3148 -> X
     9:9:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3148:3148 -> X
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> X
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> X
     10:10:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3149 -> X
     11:11:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3149:3149 -> X
     12:16:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3146:3150 -> X
     17:17:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3144:3144 -> X
     18:36:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3137:3155 -> X
     1:5:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3159:3163 -> Y
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> Y
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> Y
     6:6:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3173 -> Y
     7:7:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3173:3173 -> Y
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> Y
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> Y
     8:8:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3178 -> Y
     9:9:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3178:3178 -> Y
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> Y
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> Y
     10:10:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3179 -> Y
     11:12:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3179:3180 -> Y
     13:13:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3177:3177 -> Y
     14:36:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3167:3189 -> Y
     1:5:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3193:3197 -> Z
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> Z
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> Z
     6:6:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3208 -> Z
     7:7:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3208:3208 -> Z
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> Z
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> Z
     8:8:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3213 -> Z
     9:9:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3213:3213 -> Z
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> Z
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> Z
     10:10:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3214 -> Z
     11:12:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3214:3215 -> Z
     13:13:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3212:3212 -> Z
     14:37:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3201:3224 -> Z
     1:28:com.android.tools.r8.graph.CfCode BooleanMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):51:78 -> a
     1:3:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3228:3230 -> a0
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a0
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a0
     4:4:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3241 -> a0
     5:5:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3241:3241 -> a0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a0
     6:6:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3243 -> a0
     7:7:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3243:3243 -> a0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a0
     8:8:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3243 -> a0
     9:9:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3243:3243 -> a0
     10:12:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3242:3244 -> a0
@@ -33238,13 +33365,13 @@
     14:30:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3234:3250 -> a0
     1:21:com.android.tools.r8.graph.CfCode BooleanMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):82:102 -> b
     1:3:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3254:3256 -> b0
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b0
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b0
     4:4:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3267 -> b0
     5:5:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3267:3267 -> b0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b0
     6:6:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3269 -> b0
     7:7:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3269:3269 -> b0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b0
     8:8:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3269 -> b0
     9:9:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3269:3269 -> b0
     10:12:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3268:3270 -> b0
@@ -33252,161 +33379,161 @@
     14:30:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3260:3276 -> b0
     1:15:com.android.tools.r8.graph.CfCode ByteMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):106:120 -> c
     1:7:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3280:3286 -> c0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> c0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> c0
     8:8:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3312 -> c0
     9:9:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3312:3312 -> c0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> c0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> c0
     10:10:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3317 -> c0
     11:11:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3317:3317 -> c0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> c0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> c0
     12:12:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3318 -> c0
     13:14:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3318:3319 -> c0
     15:15:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3316:3316 -> c0
     16:50:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3290:3324 -> c0
     1:19:com.android.tools.r8.graph.CfCode ByteMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):124:142 -> d
     1:10:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3328:3337 -> d0
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> d0
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> d0
     11:11:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3376 -> d0
     12:12:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3376:3376 -> d0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> d0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> d0
     13:13:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3381 -> d0
     14:14:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3381:3381 -> d0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> d0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> d0
     15:15:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3382 -> d0
     16:17:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3382:3383 -> d0
     18:18:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3380:3380 -> d0
     19:66:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3341:3388 -> d0
     1:15:com.android.tools.r8.graph.CfCode ByteMethods_toUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):146:160 -> e
     1:6:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3392:3397 -> e0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> e0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> e0
     7:7:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3413 -> e0
     8:8:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3413:3413 -> e0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> e0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> e0
     9:9:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3418 -> e0
     10:10:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3418:3418 -> e0
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> e0
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> e0
     11:11:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3419 -> e0
     12:13:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3419:3420 -> e0
     14:14:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3417:3417 -> e0
     15:42:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3401:3428 -> e0
     1:16:com.android.tools.r8.graph.CfCode ByteMethods_toUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):164:179 -> f
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3433:3437 -> f0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3455 -> f0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3455:3455 -> f0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3457 -> f0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3457:3457 -> f0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3462 -> f0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3462:3462 -> f0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3463 -> f0
     13:14:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3463:3464 -> f0
     15:20:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3461:3466 -> f0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3470 -> f0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3470:3470 -> f0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3472 -> f0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3472:3472 -> f0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     25:25:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3473 -> f0
     26:26:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3473:3473 -> f0
     27:30:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3471:3474 -> f0
     31:31:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3469:3469 -> f0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     32:32:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3480 -> f0
     33:33:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3480:3480 -> f0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     34:34:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3482 -> f0
     35:35:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3482:3482 -> f0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     36:36:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3483 -> f0
     37:37:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3483:3483 -> f0
     38:41:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3481:3484 -> f0
     42:49:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3479:3486 -> f0
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     50:50:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3490 -> f0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3490:3490 -> f0
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3492 -> f0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3492:3492 -> f0
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3493 -> f0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3493:3493 -> f0
     56:59:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3491:3494 -> f0
     60:60:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3489:3489 -> f0
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     61:61:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3500 -> f0
     62:62:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3500:3500 -> f0
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     63:63:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3502 -> f0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3502:3502 -> f0
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     65:65:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3503 -> f0
     66:66:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3503:3503 -> f0
     67:70:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3501:3504 -> f0
     71:78:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3499:3506 -> f0
-    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     79:79:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3510 -> f0
     80:80:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3510:3510 -> f0
-    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     81:81:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3512 -> f0
     82:82:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3512:3512 -> f0
-    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     83:83:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3513 -> f0
     84:84:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3513:3513 -> f0
     85:88:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3511:3514 -> f0
     89:89:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3509:3509 -> f0
-    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     90:90:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3520 -> f0
     91:91:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3520:3520 -> f0
-    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     92:92:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3522 -> f0
     93:93:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3522:3522 -> f0
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     94:94:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3523 -> f0
     95:95:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3523:3523 -> f0
     96:99:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3521:3524 -> f0
     100:107:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3519:3526 -> f0
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     108:108:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3530 -> f0
     109:109:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3530:3530 -> f0
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     110:110:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3532 -> f0
     111:111:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3532:3532 -> f0
-    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     112:112:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3533 -> f0
     113:113:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3533:3533 -> f0
     114:117:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3531:3534 -> f0
     118:118:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3529:3529 -> f0
-    119:119:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    119:119:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     119:119:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3540 -> f0
     120:120:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3540:3540 -> f0
-    121:121:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    121:121:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     121:121:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3542 -> f0
     122:122:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3542:3542 -> f0
-    123:123:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    123:123:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     123:123:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3543 -> f0
     124:124:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3543:3543 -> f0
     125:128:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3541:3544 -> f0
     129:129:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3539:3539 -> f0
-    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     130:130:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3549 -> f0
     131:131:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3549:3549 -> f0
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     132:132:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3551 -> f0
     133:133:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3551:3551 -> f0
     134:136:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3550:3552 -> f0
     137:137:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3548:3548 -> f0
-    138:138:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    138:138:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     138:138:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3557 -> f0
     139:139:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3557:3557 -> f0
-    140:140:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    140:140:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     140:140:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3559 -> f0
     141:141:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3559:3559 -> f0
-    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> f0
+    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     142:142:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3560 -> f0
     143:143:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3560:3560 -> f0
     144:147:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3558:3561 -> f0
@@ -33414,837 +33541,837 @@
     149:277:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3441:3569 -> f0
     1:15:com.android.tools.r8.graph.CfCode CharacterMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):183:197 -> g
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3573:3577 -> g0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3592 -> g0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3592:3592 -> g0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3594 -> g0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3594:3594 -> g0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3599 -> g0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3599:3599 -> g0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3600 -> g0
     13:14:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3600:3601 -> g0
     15:20:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3598:3603 -> g0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3607 -> g0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3607:3607 -> g0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3609 -> g0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3609:3609 -> g0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     25:25:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3610 -> g0
     26:26:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3610:3610 -> g0
     27:30:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3608:3611 -> g0
     31:31:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3606:3606 -> g0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     32:32:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3617 -> g0
     33:33:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3617:3617 -> g0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     34:34:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3619 -> g0
     35:35:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3619:3619 -> g0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     36:36:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3620 -> g0
     37:37:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3620:3620 -> g0
     38:41:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3618:3621 -> g0
     42:49:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3616:3623 -> g0
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     50:50:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3627 -> g0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3627:3627 -> g0
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3629 -> g0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3629:3629 -> g0
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3630 -> g0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3630:3630 -> g0
     56:59:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3628:3631 -> g0
     60:60:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3626:3626 -> g0
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     61:61:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3637 -> g0
     62:62:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3637:3637 -> g0
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     63:63:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3639 -> g0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3639:3639 -> g0
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     65:65:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3640 -> g0
     66:66:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3640:3640 -> g0
     67:70:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3638:3641 -> g0
     71:78:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3636:3643 -> g0
-    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     79:79:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3647 -> g0
     80:80:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3647:3647 -> g0
-    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     81:81:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3649 -> g0
     82:82:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3649:3649 -> g0
-    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     83:83:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3650 -> g0
     84:84:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3650:3650 -> g0
     85:88:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3648:3651 -> g0
     89:89:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3646:3646 -> g0
-    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     90:90:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3657 -> g0
     91:91:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3657:3657 -> g0
-    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     92:92:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3659 -> g0
     93:93:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3659:3659 -> g0
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     94:94:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3660 -> g0
     95:95:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3660:3660 -> g0
     96:99:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3658:3661 -> g0
     100:100:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3656:3656 -> g0
-    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     101:101:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3666 -> g0
     102:102:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3666:3666 -> g0
-    103:103:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    103:103:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     103:103:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3668 -> g0
     104:104:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3668:3668 -> g0
     105:107:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3667:3669 -> g0
     108:108:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3665:3665 -> g0
-    109:109:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    109:109:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     109:109:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3674 -> g0
     110:110:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3674:3674 -> g0
-    111:111:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    111:111:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     111:111:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3676 -> g0
     112:112:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3676:3676 -> g0
-    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> g0
+    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     113:113:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3677 -> g0
     114:114:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3677:3677 -> g0
     115:118:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3675:3678 -> g0
     119:119:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3673:3673 -> g0
     120:225:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3581:3686 -> g0
     1:3:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):202:204 -> h
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h
     4:4:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):210 -> h
     5:5:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):210:210 -> h
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h
     6:6:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):216 -> h
     7:7:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):216:216 -> h
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h
     8:8:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):218 -> h
     9:9:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):218:218 -> h
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h
     10:10:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):218 -> h
     11:11:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):218:218 -> h
     12:14:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):217:219 -> h
     15:15:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):215:215 -> h
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h
     16:16:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):224 -> h
     17:17:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):224:224 -> h
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h
     18:18:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):226 -> h
     19:19:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):226:226 -> h
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h
     20:20:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):226 -> h
     21:21:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):226:226 -> h
     22:24:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):225:227 -> h
     25:25:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):223:223 -> h
     26:50:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):208:232 -> h
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3690:3694 -> h0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3706 -> h0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3706:3706 -> h0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3708 -> h0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3708:3708 -> h0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3713 -> h0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3713:3713 -> h0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3714 -> h0
     13:14:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3714:3715 -> h0
     15:20:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3712:3717 -> h0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3721 -> h0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3721:3721 -> h0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3723 -> h0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3723:3723 -> h0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     25:25:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3724 -> h0
     26:26:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3724:3724 -> h0
     27:30:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3722:3725 -> h0
     31:31:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3720:3720 -> h0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     32:32:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3731 -> h0
     33:33:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3731:3731 -> h0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     34:34:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3733 -> h0
     35:35:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3733:3733 -> h0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     36:36:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3734 -> h0
     37:37:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3734:3734 -> h0
     38:41:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3732:3735 -> h0
     42:49:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3730:3737 -> h0
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     50:50:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3741 -> h0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3741:3741 -> h0
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3743 -> h0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3743:3743 -> h0
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3744 -> h0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3744:3744 -> h0
     56:59:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3742:3745 -> h0
     60:60:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3740:3740 -> h0
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     61:61:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3751 -> h0
     62:62:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3751:3751 -> h0
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     63:63:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3753 -> h0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3753:3753 -> h0
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     65:65:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3754 -> h0
     66:66:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3754:3754 -> h0
     67:70:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3752:3755 -> h0
     71:71:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3750:3750 -> h0
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     72:72:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3760 -> h0
     73:73:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3760:3760 -> h0
-    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     74:74:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3762 -> h0
     75:75:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3762:3762 -> h0
     76:78:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3761:3763 -> h0
     79:79:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3759:3759 -> h0
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     80:80:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3768 -> h0
     81:81:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3768:3768 -> h0
-    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     82:82:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3770 -> h0
     83:83:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3770:3770 -> h0
-    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> h0
+    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     84:84:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3771 -> h0
     85:85:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3771:3771 -> h0
     86:89:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3769:3772 -> h0
     90:90:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3767:3767 -> h0
     91:173:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3698:3780 -> h0
     1:8:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):516:523 -> i
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     9:9:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):529 -> i
     10:10:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):529:529 -> i
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     11:11:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):536 -> i
     12:12:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):536:536 -> i
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     13:13:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):538 -> i
     14:14:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):538:538 -> i
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     15:15:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):538 -> i
     16:16:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):538:538 -> i
     17:19:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):537:539 -> i
     20:20:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):535:535 -> i
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     21:21:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):564 -> i
     22:22:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):564:564 -> i
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     23:23:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):566 -> i
     24:24:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):566:566 -> i
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     25:25:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):567 -> i
     26:26:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):567:567 -> i
     27:30:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):565:568 -> i
     31:31:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):563:563 -> i
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     32:32:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):573 -> i
     33:33:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):573:573 -> i
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     34:34:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):575 -> i
     35:35:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):575:575 -> i
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     36:36:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):576 -> i
     37:37:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):576:576 -> i
     38:41:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):574:577 -> i
     42:42:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):572:572 -> i
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     43:43:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):588 -> i
     44:44:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):588:588 -> i
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     45:45:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):590 -> i
     46:46:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):590:590 -> i
-    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i
+    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     47:47:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):591 -> i
     48:48:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):591:591 -> i
     49:52:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):589:592 -> i
     53:53:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):587:587 -> i
     54:124:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):527:597 -> i
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3784:3788 -> i0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3806 -> i0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3806:3806 -> i0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3808 -> i0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3808:3808 -> i0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3809 -> i0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3809:3809 -> i0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> i0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3810 -> i0
     13:13:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3810:3810 -> i0
     14:18:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3807:3811 -> i0
     19:19:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3805:3805 -> i0
     20:45:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3792:3817 -> i0
     1:6:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):601:606 -> j
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     7:7:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):613 -> j
     8:8:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):613:613 -> j
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     9:9:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):620 -> j
     10:10:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):620:620 -> j
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     11:11:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):622 -> j
     12:12:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):622:622 -> j
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     13:13:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):623 -> j
     14:14:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):623:623 -> j
     15:18:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):621:624 -> j
     19:19:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):619:619 -> j
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     20:20:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):631 -> j
     21:21:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):631:631 -> j
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     22:22:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):633 -> j
     23:23:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):633:633 -> j
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     24:24:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):634 -> j
     25:25:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):634:634 -> j
     26:29:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):632:635 -> j
     30:30:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):630:630 -> j
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     31:31:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):640 -> j
     32:32:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):640:640 -> j
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     33:33:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):642 -> j
     34:34:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):642:642 -> j
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     35:35:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):643 -> j
     36:36:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):643:643 -> j
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     37:37:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):644 -> j
     38:38:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):644:644 -> j
     39:43:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):641:645 -> j
     44:44:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):639:639 -> j
     45:86:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):610:651 -> j
     1:41:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3821:3861 -> j0
-    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     42:42:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3879 -> j0
     43:43:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3879:3879 -> j0
-    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     44:44:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3883 -> j0
     45:45:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3883:3883 -> j0
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     46:46:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3886 -> j0
     47:47:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3886:3886 -> j0
-    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     48:48:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3888 -> j0
     49:49:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3888:3888 -> j0
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     50:50:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3892 -> j0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3892:3892 -> j0
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3894 -> j0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3894:3894 -> j0
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3895 -> j0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3895:3895 -> j0
-    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     56:56:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3896 -> j0
     57:57:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3896:3896 -> j0
     58:62:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3893:3897 -> j0
     63:63:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3891:3891 -> j0
-    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3908 -> j0
     65:65:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3908:3908 -> j0
-    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     66:66:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3912 -> j0
     67:67:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3912:3912 -> j0
-    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     68:68:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3915 -> j0
     69:69:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3915:3915 -> j0
-    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     70:70:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3917 -> j0
     71:71:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3917:3917 -> j0
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     72:72:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3921 -> j0
     73:73:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3921:3921 -> j0
-    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     74:74:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3923 -> j0
     75:75:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3923:3923 -> j0
-    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     76:76:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3924 -> j0
     77:77:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3924:3924 -> j0
-    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     78:78:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3925 -> j0
     79:79:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3925:3925 -> j0
     80:84:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3922:3926 -> j0
     85:85:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3920:3920 -> j0
-    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     86:86:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3937 -> j0
     87:87:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3937:3937 -> j0
-    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     88:88:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3941 -> j0
     89:89:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3941:3941 -> j0
-    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     90:90:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3944 -> j0
     91:91:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3944:3944 -> j0
-    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     92:92:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3946 -> j0
     93:93:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3946:3946 -> j0
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     94:94:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3950 -> j0
     95:95:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3950:3950 -> j0
-    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     96:96:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3952 -> j0
     97:97:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3952:3952 -> j0
-    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     98:98:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3953 -> j0
     99:99:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3953:3953 -> j0
-    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     100:100:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3954 -> j0
     101:101:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3954:3954 -> j0
     102:106:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3951:3955 -> j0
     107:107:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3949:3949 -> j0
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     108:108:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3966 -> j0
     109:109:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3966:3966 -> j0
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     110:110:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3970 -> j0
     111:111:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3970:3970 -> j0
-    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     112:112:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3973 -> j0
     113:113:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3973:3973 -> j0
-    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     114:114:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3975 -> j0
     115:115:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3975:3975 -> j0
-    116:116:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    116:116:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     116:116:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3979 -> j0
     117:117:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3979:3979 -> j0
-    118:118:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    118:118:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     118:118:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3981 -> j0
     119:119:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3981:3981 -> j0
-    120:120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    120:120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     120:120:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3982 -> j0
     121:121:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3982:3982 -> j0
-    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     122:122:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3983 -> j0
     123:123:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3983:3983 -> j0
     124:128:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3980:3984 -> j0
     129:129:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3978:3978 -> j0
-    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     130:130:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3995 -> j0
     131:131:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3995:3995 -> j0
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     132:132:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3999 -> j0
     133:133:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3999:3999 -> j0
-    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     134:134:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4002 -> j0
     135:135:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4002:4002 -> j0
-    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     136:136:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4004 -> j0
     137:137:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4004:4004 -> j0
-    138:138:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    138:138:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     138:138:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4008 -> j0
     139:139:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4008:4008 -> j0
-    140:140:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    140:140:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     140:140:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4010 -> j0
     141:141:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4010:4010 -> j0
-    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     142:142:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4011 -> j0
     143:143:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4011:4011 -> j0
-    144:144:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    144:144:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     144:144:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4012 -> j0
     145:145:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4012:4012 -> j0
     146:150:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4009:4013 -> j0
     151:151:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4007:4007 -> j0
-    152:152:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    152:152:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     152:152:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4024 -> j0
     153:153:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4024:4024 -> j0
-    154:154:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    154:154:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     154:154:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4028 -> j0
     155:155:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4028:4028 -> j0
-    156:156:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    156:156:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     156:156:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4031 -> j0
     157:157:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4031:4031 -> j0
-    158:158:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    158:158:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     158:158:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4033 -> j0
     159:159:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4033:4033 -> j0
-    160:160:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    160:160:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     160:160:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4037 -> j0
     161:161:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4037:4037 -> j0
-    162:162:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    162:162:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     162:162:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4039 -> j0
     163:163:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4039:4039 -> j0
-    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     164:164:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4040 -> j0
     165:165:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4040:4040 -> j0
-    166:166:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    166:166:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     166:166:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4041 -> j0
     167:167:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4041:4041 -> j0
     168:172:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4038:4042 -> j0
     173:173:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4036:4036 -> j0
-    174:174:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    174:174:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     174:174:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4053 -> j0
     175:175:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4053:4053 -> j0
-    176:176:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    176:176:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     176:176:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4057 -> j0
     177:177:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4057:4057 -> j0
-    178:178:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    178:178:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     178:178:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4060 -> j0
     179:179:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4060:4060 -> j0
-    180:180:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    180:180:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     180:180:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4062 -> j0
     181:181:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4062:4062 -> j0
-    182:182:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    182:182:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     182:182:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4066 -> j0
     183:183:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4066:4066 -> j0
-    184:184:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    184:184:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     184:184:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4068 -> j0
     185:185:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4068:4068 -> j0
-    186:186:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    186:186:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     186:186:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4069 -> j0
     187:187:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4069:4069 -> j0
-    188:188:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    188:188:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     188:188:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4070 -> j0
     189:189:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4070:4070 -> j0
     190:194:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4067:4071 -> j0
     195:195:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4065:4065 -> j0
-    196:196:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    196:196:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     196:196:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4082 -> j0
     197:197:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4082:4082 -> j0
-    198:198:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    198:198:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     198:198:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4086 -> j0
     199:199:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4086:4086 -> j0
-    200:200:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    200:200:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     200:200:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4089 -> j0
     201:201:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4089:4089 -> j0
-    202:202:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    202:202:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     202:202:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4091 -> j0
     203:203:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4091:4091 -> j0
-    204:204:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    204:204:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     204:204:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4095 -> j0
     205:205:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4095:4095 -> j0
-    206:206:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    206:206:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     206:206:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4097 -> j0
     207:207:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4097:4097 -> j0
-    208:208:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    208:208:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     208:208:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4098 -> j0
     209:209:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4098:4098 -> j0
-    210:210:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    210:210:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     210:210:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4099 -> j0
     211:211:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4099:4099 -> j0
     212:216:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4096:4100 -> j0
     217:217:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4094:4094 -> j0
-    218:218:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    218:218:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     218:218:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4111 -> j0
     219:219:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4111:4111 -> j0
-    220:220:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    220:220:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     220:220:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4115 -> j0
     221:221:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4115:4115 -> j0
-    222:222:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    222:222:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     222:222:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4118 -> j0
     223:223:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4118:4118 -> j0
-    224:224:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    224:224:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     224:224:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4120 -> j0
     225:225:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4120:4120 -> j0
-    226:226:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    226:226:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     226:226:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4124 -> j0
     227:227:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4124:4124 -> j0
-    228:228:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    228:228:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     228:228:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4126 -> j0
     229:229:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4126:4126 -> j0
-    230:230:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    230:230:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     230:230:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4127 -> j0
     231:231:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4127:4127 -> j0
-    232:232:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    232:232:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     232:232:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4128 -> j0
     233:233:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4128:4128 -> j0
     234:238:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4125:4129 -> j0
     239:239:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4123:4123 -> j0
-    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     240:240:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4144 -> j0
     241:241:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4144:4144 -> j0
-    242:242:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    242:242:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     242:242:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4146 -> j0
     243:243:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4146:4146 -> j0
-    244:244:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> j0
+    244:244:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     244:244:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4147 -> j0
     245:245:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4147:4147 -> j0
     246:249:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4145:4148 -> j0
     250:250:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4143:4143 -> j0
     251:539:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3865:4153 -> j0
     1:11:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):655:665 -> k
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     12:12:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):671 -> k
     13:13:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):671:671 -> k
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     14:14:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):678 -> k
     15:15:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):678:678 -> k
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     16:16:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):680 -> k
     17:17:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):680:680 -> k
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     18:18:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):680 -> k
     19:19:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):680:680 -> k
     20:22:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):679:681 -> k
     23:23:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):677:677 -> k
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     24:24:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):705 -> k
     25:25:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):705:705 -> k
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     26:26:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):707 -> k
     27:27:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):707:707 -> k
     28:30:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):706:708 -> k
     31:31:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):704:704 -> k
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     32:32:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):713 -> k
     33:33:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):713:713 -> k
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     34:34:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):715 -> k
     35:35:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):715:715 -> k
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     36:36:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):716 -> k
     37:37:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):716:716 -> k
     38:41:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):714:717 -> k
     42:42:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):712:712 -> k
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     43:43:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):725 -> k
     44:44:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):725:725 -> k
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     45:45:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):727 -> k
     46:46:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):727:727 -> k
     47:49:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):726:728 -> k
     50:50:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):724:724 -> k
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     51:51:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):733 -> k
     52:52:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):733:733 -> k
-    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     53:53:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):735 -> k
     54:54:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):735:735 -> k
-    55:55:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    55:55:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     55:55:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):736 -> k
     56:56:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):736:736 -> k
     57:60:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):734:737 -> k
     61:61:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):732:732 -> k
-    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     62:62:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):747 -> k
     63:63:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):747:747 -> k
-    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     64:64:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):749 -> k
     65:65:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):749:749 -> k
-    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     66:66:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):750 -> k
     67:67:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):750:750 -> k
-    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     68:68:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):751 -> k
     69:69:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):751:751 -> k
     70:74:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):748:752 -> k
     75:75:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):746:746 -> k
-    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     76:76:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):756 -> k
     77:77:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):756:756 -> k
-    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     78:78:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):758 -> k
     79:79:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):758:758 -> k
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     80:80:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):763 -> k
     81:81:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):763:763 -> k
-    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     82:82:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):764 -> k
     83:84:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):764:765 -> k
     85:90:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):762:767 -> k
-    91:91:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    91:91:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     91:91:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):771 -> k
     92:92:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):771:771 -> k
-    93:93:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    93:93:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     93:93:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):773 -> k
     94:94:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):773:773 -> k
-    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     95:95:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):774 -> k
     96:96:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):774:774 -> k
     97:100:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):772:775 -> k
     101:101:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):770:770 -> k
-    102:102:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    102:102:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     102:102:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):781 -> k
     103:103:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):781:781 -> k
-    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     104:104:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):783 -> k
     105:105:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):783:783 -> k
-    106:106:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    106:106:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     106:106:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):784 -> k
     107:107:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):784:784 -> k
     108:111:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):782:785 -> k
     112:112:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):780:780 -> k
-    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     113:113:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):790 -> k
     114:114:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):790:790 -> k
-    115:115:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    115:115:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     115:115:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):792 -> k
     116:116:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):792:792 -> k
     117:119:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):791:793 -> k
     120:120:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):789:789 -> k
-    121:121:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    121:121:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     121:121:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):798 -> k
     122:122:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):798:798 -> k
-    123:123:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    123:123:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     123:123:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):800 -> k
     124:124:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):800:800 -> k
-    125:125:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    125:125:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     125:125:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):801 -> k
     126:126:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):801:801 -> k
     127:130:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):799:802 -> k
     131:131:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):797:797 -> k
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     132:132:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):813 -> k
     133:133:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):813:813 -> k
-    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     134:134:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):815 -> k
     135:135:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):815:815 -> k
-    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k
+    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     136:136:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):816 -> k
     137:137:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):816:816 -> k
     138:141:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):814:817 -> k
     142:142:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):812:812 -> k
     143:296:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):669:822 -> k
     1:6:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4157:4162 -> k0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4178 -> k0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4178:4178 -> k0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4180 -> k0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4180:4180 -> k0
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> k0
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4181 -> k0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4181:4181 -> k0
     13:16:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4179:4182 -> k0
     17:17:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4177:4177 -> k0
     18:46:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4166:4194 -> k0
     1:9:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):826:834 -> l
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     10:10:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):840 -> l
     11:11:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):840:840 -> l
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     12:12:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):847 -> l
     13:13:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):847:847 -> l
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     14:14:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):849 -> l
     15:15:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):849:849 -> l
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     16:16:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):849 -> l
     17:17:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):849:849 -> l
     18:20:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):848:850 -> l
     21:21:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):846:846 -> l
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     22:22:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):875 -> l
     23:23:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):875:875 -> l
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     24:24:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):877 -> l
     25:25:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):877:877 -> l
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     26:26:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):878 -> l
     27:27:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):878:878 -> l
     28:31:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):876:879 -> l
     32:32:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):874:874 -> l
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     33:33:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):884 -> l
     34:34:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):884:884 -> l
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     35:35:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):886 -> l
     36:36:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):886:886 -> l
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     37:37:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):887 -> l
     38:38:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):887:887 -> l
     39:42:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):885:888 -> l
     43:43:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):883:883 -> l
-    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     44:44:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):892 -> l
     45:45:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):892:892 -> l
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     46:46:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):894 -> l
     47:47:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):894:894 -> l
-    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     48:48:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):899 -> l
     49:49:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):899:899 -> l
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     50:50:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):900 -> l
     51:52:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):900:901 -> l
     53:58:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):898:903 -> l
-    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     59:59:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):907 -> l
     60:60:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):907:907 -> l
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     61:61:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):909 -> l
     62:62:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):909:909 -> l
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     63:63:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):910 -> l
     64:64:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):910:910 -> l
     65:68:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):908:911 -> l
     69:69:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):906:906 -> l
-    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     70:70:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):917 -> l
     71:71:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):917:917 -> l
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     72:72:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):919 -> l
     73:73:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):919:919 -> l
-    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     74:74:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):920 -> l
     75:75:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):920:920 -> l
     76:79:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):918:921 -> l
     80:80:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):916:916 -> l
-    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     81:81:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):926 -> l
     82:82:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):926:926 -> l
-    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     83:83:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):928 -> l
     84:84:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):928:928 -> l
     85:87:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):927:929 -> l
     88:88:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):925:925 -> l
-    89:89:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    89:89:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     89:89:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):934 -> l
     90:90:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):934:934 -> l
-    91:91:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    91:91:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     91:91:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):936 -> l
     92:92:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):936:936 -> l
-    93:93:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    93:93:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     93:93:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):937 -> l
     94:94:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):937:937 -> l
     95:98:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):935:938 -> l
     99:99:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):933:933 -> l
-    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     100:100:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):949 -> l
     101:101:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):949:949 -> l
-    102:102:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    102:102:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     102:102:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):951 -> l
     103:103:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):951:951 -> l
-    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l
+    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     104:104:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):952 -> l
     105:105:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):952:952 -> l
     106:109:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):950:953 -> l
     110:110:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):948:948 -> l
     111:231:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):838:958 -> l
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4198:4202 -> l0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4217 -> l0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4217:4217 -> l0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> l0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4218 -> l0
     9:10:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4218:4219 -> l0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4216:4216 -> l0
     12:31:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4206:4225 -> l0
     1:2:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):963:964 -> m
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> m
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> m
     3:3:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):973 -> m
     4:4:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):973:973 -> m
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> m
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> m
     5:5:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):975 -> m
     6:6:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):975:975 -> m
     7:9:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):974:976 -> m
     10:10:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):972:972 -> m
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> m
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> m
     11:11:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):981 -> m
     12:12:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):981:981 -> m
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> m
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> m
     13:13:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):983 -> m
     14:14:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):983:983 -> m
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> m
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> m
     15:15:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):984 -> m
     16:16:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):984:984 -> m
     17:20:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):982:985 -> m
@@ -34252,18 +34379,18 @@
     22:43:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):968:989 -> m
     1:21:com.android.tools.r8.graph.CfCode ObjectsMethods_isNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4229:4249 -> m0
     1:2:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):993:994 -> n
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> n
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> n
     3:3:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1003 -> n
     4:4:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1003:1003 -> n
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> n
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> n
     5:5:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1005 -> n
     6:6:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1005:1005 -> n
     7:9:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1004:1006 -> n
     10:10:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1002:1002 -> n
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> n
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> n
     11:11:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1011 -> n
     12:12:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1011:1011 -> n
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> n
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> n
     13:13:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1013 -> n
     14:14:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1013:1013 -> n
     15:17:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1012:1014 -> n
@@ -34271,168 +34398,168 @@
     19:39:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):998:1018 -> n
     1:21:com.android.tools.r8.graph.CfCode ObjectsMethods_nonNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4253:4273 -> n0
     1:2:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1023:1024 -> o
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o
     3:3:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1033 -> o
     4:4:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1033:1033 -> o
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o
     5:5:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1035 -> o
     6:6:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1035:1035 -> o
     7:9:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1034:1036 -> o
     10:10:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1032:1032 -> o
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o
     11:11:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1041 -> o
     12:12:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1041:1041 -> o
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o
     13:13:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1043 -> o
     14:14:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1043:1043 -> o
     15:17:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1042:1044 -> o
     18:18:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1040:1040 -> o
     19:39:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1028:1048 -> o
     1:16:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4278:4293 -> o0
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o0
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o0
     17:17:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4297 -> o0
     18:18:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4297:4297 -> o0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o0
     19:19:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4299 -> o0
     20:20:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4299:4299 -> o0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4300 -> o0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4300:4300 -> o0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> o0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4301 -> o0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4301:4301 -> o0
     25:29:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4298:4302 -> o0
     30:30:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4296:4296 -> o0
     31:53:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4285:4307 -> o0
     1:4:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052:1055 -> p
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p
     5:5:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1065 -> p
     6:6:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1065:1065 -> p
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p
     7:7:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1067 -> p
     8:8:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1067:1067 -> p
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p
     9:9:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1067 -> p
     10:10:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1067:1067 -> p
     11:13:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1066:1068 -> p
     14:14:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1064:1064 -> p
     15:37:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1059:1081 -> p
     1:17:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4312:4328 -> p0
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     18:18:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4332 -> p0
     19:19:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4332:4332 -> p0
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     20:20:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4334 -> p0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4334:4334 -> p0
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4335 -> p0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4335:4335 -> p0
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4336 -> p0
     25:25:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4336:4336 -> p0
     26:30:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4333:4337 -> p0
     31:31:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4331:4331 -> p0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     32:32:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4339 -> p0
     33:33:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4339:4339 -> p0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     34:34:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4343 -> p0
     35:35:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4343:4343 -> p0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     36:36:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4345 -> p0
     37:37:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4345:4345 -> p0
     38:40:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4344:4346 -> p0
     41:50:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4342:4351 -> p0
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4355 -> p0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4355:4355 -> p0
-    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4357 -> p0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4357:4357 -> p0
-    55:55:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
+    55:55:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4358 -> p0
     56:56:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4358:4358 -> p0
-    57:57:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> p0
+    57:57:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     57:57:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4359 -> p0
     58:58:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4359:4359 -> p0
     59:63:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4356:4360 -> p0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4354:4354 -> p0
     65:110:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4320:4365 -> p0
     1:5:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1085:1089 -> q
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q
     6:6:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1099 -> q
     7:7:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1099:1099 -> q
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q
     8:8:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1101 -> q
     9:9:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1101:1101 -> q
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q
     10:10:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1101 -> q
     11:11:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1101:1101 -> q
     12:14:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1100:1102 -> q
     15:15:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1098:1098 -> q
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q
     16:16:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1109 -> q
     17:17:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1109:1109 -> q
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q
     18:18:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1111 -> q
     19:19:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1111:1111 -> q
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q
     20:20:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1111 -> q
     21:21:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1111:1111 -> q
     22:24:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1110:1112 -> q
     25:25:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1108:1108 -> q
     26:56:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1093:1123 -> q
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4370:4374 -> q0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4383 -> q0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4383:4383 -> q0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4389 -> q0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4389:4389 -> q0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4391 -> q0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4391:4391 -> q0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> q0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4392 -> q0
     13:13:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4392:4392 -> q0
     14:17:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4390:4393 -> q0
     18:18:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4388:4388 -> q0
     19:42:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4378:4401 -> q0
     1:5:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1127:1131 -> r
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r
     6:6:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1141 -> r
     7:7:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1141:1141 -> r
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r
     8:8:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1143 -> r
     9:9:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1143:1143 -> r
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r
     10:10:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1143 -> r
     11:11:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1143:1143 -> r
     12:14:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1142:1144 -> r
     15:15:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1140:1140 -> r
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r
     16:16:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1151 -> r
     17:17:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1151:1151 -> r
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r
     18:18:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1153 -> r
     19:19:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1153:1153 -> r
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r
     20:20:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1153 -> r
     21:21:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1153:1153 -> r
     22:24:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1152:1154 -> r
     25:25:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1150:1150 -> r
     26:56:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1135:1165 -> r
     1:10:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4405:4414 -> r0
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r0
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4418 -> r0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4418:4418 -> r0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r0
     13:13:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4420 -> r0
     14:14:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4420:4420 -> r0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r0
     15:15:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4421 -> r0
     16:16:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4421:4421 -> r0
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> r0
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r0
     17:17:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4422 -> r0
     18:18:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4422:4422 -> r0
     19:23:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4419:4423 -> r0
@@ -34440,411 +34567,411 @@
     25:42:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4411:4428 -> r0
     1:29:com.android.tools.r8.graph.CfCode IntegerMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1169:1197 -> s
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4432:4436 -> s0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> s0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> s0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4451 -> s0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4451:4451 -> s0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> s0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> s0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4453 -> s0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4453:4453 -> s0
     10:12:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4452:4454 -> s0
     13:13:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4450:4450 -> s0
     14:34:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4440:4460 -> s0
     1:5:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1201:1205 -> t
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t
     6:6:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1226 -> t
     7:7:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1226:1226 -> t
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t
     8:8:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1228 -> t
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1228:1228 -> t
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1229 -> t
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1229:1229 -> t
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t
     12:12:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1230 -> t
     13:13:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1230:1230 -> t
     14:18:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1227:1231 -> t
     19:19:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1225:1225 -> t
     20:47:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1209:1236 -> t
     1:6:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4464:4469 -> t0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4479 -> t0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4479:4479 -> t0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4480 -> t0
     10:11:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4480:4481 -> t0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4478:4478 -> t0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4490 -> t0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4490:4490 -> t0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4492 -> t0
     16:16:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4492:4492 -> t0
     17:19:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4491:4493 -> t0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4489:4489 -> t0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4498 -> t0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4498:4498 -> t0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4500 -> t0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4500:4500 -> t0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     25:25:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4501 -> t0
     26:26:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4501:4501 -> t0
     27:30:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4499:4502 -> t0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4497:4497 -> t0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     32:32:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4510 -> t0
     33:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4510:4510 -> t0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> t0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4511 -> t0
     35:36:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4511:4512 -> t0
     37:37:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4509:4509 -> t0
     38:83:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4473:4518 -> t0
     1:30:com.android.tools.r8.graph.CfCode IntegerMethods_divideUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1240:1269 -> u
     1:6:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4523:4528 -> u0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4538 -> u0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4538:4538 -> u0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4539 -> u0
     10:11:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4539:4540 -> u0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4537:4537 -> u0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4549 -> u0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4549:4549 -> u0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4550 -> u0
     16:17:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4550:4551 -> u0
     18:18:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4548:4548 -> u0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4556 -> u0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4556:4556 -> u0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4558 -> u0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4558:4558 -> u0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4558 -> u0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4558:4558 -> u0
     25:27:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4557:4559 -> u0
     28:28:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4555:4555 -> u0
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     29:29:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4567 -> u0
     30:30:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4567:4567 -> u0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> u0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4568 -> u0
     32:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4568:4569 -> u0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4566:4566 -> u0
     35:78:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4532:4575 -> u0
     1:3:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1273:1275 -> v
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v
     4:4:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1286 -> v
     5:5:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1286:1286 -> v
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v
     6:6:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1288 -> v
     7:7:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1288:1288 -> v
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v
     8:8:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1289 -> v
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1289:1289 -> v
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1290 -> v
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1290:1290 -> v
     12:16:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1287:1291 -> v
     17:17:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1285:1285 -> v
     18:35:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1279:1296 -> v
     1:6:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4580:4585 -> v0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4595 -> v0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4595:4595 -> v0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4596 -> v0
     10:11:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4596:4597 -> v0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4594:4594 -> v0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4606 -> v0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4606:4606 -> v0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4607 -> v0
     16:17:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4607:4608 -> v0
     18:18:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4605:4605 -> v0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4613 -> v0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4613:4613 -> v0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4615 -> v0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4615:4615 -> v0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4615 -> v0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4615:4615 -> v0
     25:27:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4614:4616 -> v0
     28:28:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4612:4612 -> v0
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     29:29:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4624 -> v0
     30:30:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4624:4624 -> v0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> v0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4625 -> v0
     32:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4625:4626 -> v0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4623:4623 -> v0
     35:78:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4589:4632 -> v0
     1:8:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1301:1308 -> w
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1318 -> w
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1318:1318 -> w
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1319 -> w
     12:13:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1319:1320 -> w
     14:14:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1317:1317 -> w
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     15:15:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1329 -> w
     16:16:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1329:1329 -> w
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     17:17:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1331 -> w
     18:18:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1331:1331 -> w
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     19:19:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1331 -> w
     20:20:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1331:1331 -> w
     21:23:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1330:1332 -> w
     24:24:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1328:1328 -> w
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     25:25:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1342 -> w
     26:26:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1342:1342 -> w
-    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     27:27:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1344 -> w
     28:28:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1344:1344 -> w
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     29:29:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1345 -> w
     30:30:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1345:1345 -> w
     31:34:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1343:1346 -> w
     35:35:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1341:1341 -> w
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     36:36:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1355 -> w
     37:37:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1355:1355 -> w
-    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     38:38:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1357 -> w
     39:39:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1357:1357 -> w
-    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     40:40:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1358 -> w
     41:41:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1358:1358 -> w
-    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     42:42:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1359 -> w
     43:43:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1359:1359 -> w
     44:48:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1356:1360 -> w
     49:49:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1354:1354 -> w
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     50:50:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1371 -> w
     51:51:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1371:1371 -> w
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     52:52:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1373 -> w
     53:53:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1373:1373 -> w
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     54:54:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1378 -> w
     55:55:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1378:1378 -> w
-    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     56:56:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1379 -> w
     57:58:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1379:1380 -> w
     59:64:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1377:1382 -> w
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     65:65:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1386 -> w
     66:66:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1386:1386 -> w
-    67:67:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    67:67:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     67:67:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1388 -> w
     68:68:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1388:1388 -> w
-    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     69:69:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1389 -> w
     70:70:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1389:1389 -> w
     71:74:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1387:1390 -> w
     75:75:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1385:1385 -> w
-    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     76:76:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1396 -> w
     77:77:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1396:1396 -> w
-    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     78:78:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1398 -> w
     79:79:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1398:1398 -> w
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     80:80:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1399 -> w
     81:81:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1399:1399 -> w
     82:85:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1397:1400 -> w
     86:93:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1395:1402 -> w
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     94:94:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1406 -> w
     95:95:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1406:1406 -> w
-    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     96:96:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1408 -> w
     97:97:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1408:1408 -> w
-    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     98:98:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1409 -> w
     99:99:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1409:1409 -> w
     100:103:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1407:1410 -> w
     104:104:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1405:1405 -> w
-    105:105:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    105:105:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     105:105:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1416 -> w
     106:106:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1416:1416 -> w
-    107:107:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    107:107:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     107:107:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1418 -> w
     108:108:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1418:1418 -> w
-    109:109:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    109:109:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     109:109:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1419 -> w
     110:110:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1419:1419 -> w
     111:114:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1417:1420 -> w
     115:123:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1415:1423 -> w
-    124:124:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    124:124:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     124:124:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1427 -> w
     125:125:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1427:1427 -> w
-    126:126:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    126:126:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     126:126:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1429 -> w
     127:127:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1429:1429 -> w
-    128:128:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    128:128:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     128:128:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1430 -> w
     129:129:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1430:1430 -> w
     130:133:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1428:1431 -> w
     134:134:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1426:1426 -> w
-    135:135:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    135:135:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     135:135:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1436 -> w
     136:136:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1436:1436 -> w
-    137:137:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    137:137:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     137:137:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1438 -> w
     138:138:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1438:1438 -> w
     139:141:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1437:1439 -> w
     142:142:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1435:1435 -> w
-    143:143:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    143:143:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     143:143:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1444 -> w
     144:144:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1444:1444 -> w
-    145:145:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    145:145:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     145:145:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1446 -> w
     146:146:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1446:1446 -> w
-    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w
+    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     147:147:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1447 -> w
     148:148:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1447:1447 -> w
     149:152:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1445:1448 -> w
     153:153:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1443:1443 -> w
     154:299:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1312:1457 -> w
     1:6:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4637:4642 -> w0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4652 -> w0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4652:4652 -> w0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4653 -> w0
     10:11:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4653:4654 -> w0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4651:4651 -> w0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4663 -> w0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4663:4663 -> w0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4664 -> w0
     16:17:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4664:4665 -> w0
     18:18:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4662:4662 -> w0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4670 -> w0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4670:4670 -> w0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4672 -> w0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4672:4672 -> w0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4672 -> w0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4672:4672 -> w0
     25:27:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4671:4673 -> w0
     28:28:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4669:4669 -> w0
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     29:29:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4681 -> w0
     30:30:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4681:4681 -> w0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> w0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4682 -> w0
     32:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4682:4683 -> w0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4680:4680 -> w0
     35:78:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4646:4689 -> w0
     1:30:com.android.tools.r8.graph.CfCode IntegerMethods_remainderUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1461:1490 -> x
     1:7:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4693:4699 -> x0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4709 -> x0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4709:4709 -> x0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     10:10:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4711 -> x0
     11:11:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4711:4711 -> x0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4712 -> x0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4712:4712 -> x0
     14:17:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4710:4713 -> x0
     18:18:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4708:4708 -> x0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4721 -> x0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4721:4721 -> x0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4722 -> x0
     22:23:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4722:4723 -> x0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4720:4720 -> x0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     25:25:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4734 -> x0
     26:26:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4734:4734 -> x0
-    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
+    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     27:27:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4736 -> x0
     28:28:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4736:4736 -> x0
     29:31:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4735:4737 -> x0
     32:32:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4733:4733 -> x0
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     33:33:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4739 -> x0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4739:4739 -> x0
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     35:35:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4746 -> x0
     36:36:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4746:4746 -> x0
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     37:37:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4748 -> x0
     38:38:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4748:4748 -> x0
-    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
+    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     39:39:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4749 -> x0
     40:40:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4749:4749 -> x0
     41:44:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4747:4750 -> x0
     45:45:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4745:4745 -> x0
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> x0
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     46:46:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4752 -> x0
     47:47:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4752:4752 -> x0
     48:101:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4703:4756 -> x0
     1:16:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1494:1509 -> y
     1:5:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4760:4764 -> y0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     6:6:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4774 -> y0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4774:4774 -> y0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4775 -> y0
     9:10:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4775:4776 -> y0
     11:11:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4773:4773 -> y0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4784 -> y0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4784:4784 -> y0
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4786 -> y0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4786:4786 -> y0
     16:18:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4785:4787 -> y0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4783:4783 -> y0
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4792 -> y0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4792:4792 -> y0
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4794 -> y0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4794:4794 -> y0
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4795 -> y0
     25:25:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4795:4795 -> y0
     26:29:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4793:4796 -> y0
     30:30:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4791:4791 -> y0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4803 -> y0
     32:32:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4803:4803 -> y0
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> y0
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     33:33:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4805 -> y0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4805:4805 -> y0
     35:37:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4804:4806 -> y0
     38:38:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4802:4802 -> y0
     39:82:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4768:4811 -> y0
     1:3:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1513:1515 -> z
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> z
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> z
     4:4:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1526 -> z
     5:5:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1526:1526 -> z
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> z
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> z
     6:6:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1528 -> z
     7:7:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1528:1528 -> z
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> z
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> z
     8:8:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1529 -> z
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1529:1529 -> z
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> z
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> z
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1530 -> z
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1530:1530 -> z
     12:16:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1527:1531 -> z
@@ -34871,7 +34998,7 @@
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void rewriteListOfEmpty(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):20:20 -> a
     2:5:void rewriteToCollectionMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory,java.lang.String):35:38 -> a
-    6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> a
+    6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> a
     6:6:void rewriteToCollectionMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory,java.lang.String):38 -> a
     7:9:void rewriteToCollectionMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory,java.lang.String):39:41 -> a
     1:1:void rewriteMapOfEmpty(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):30:30 -> b
@@ -34883,54 +35010,52 @@
     5:6:java.util.Deque com.android.tools.r8.utils.DequeUtils.newArrayDeque(java.lang.Object):13:14 -> a
     7:8:byte[] com.android.tools.r8.utils.StreamUtils.StreamToByteArrayClose(java.io.InputStream):16:17 -> a
     9:13:boolean com.android.tools.r8.ir.optimize.ArgumentRemovalUtils.isPinned(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):16:20 -> a
-    14:15: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):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):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
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):26 -> a
-    32:32:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    32:32:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):26 -> a
-    33:33: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
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):22:22 -> a
-    35:35:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):22 -> a
-    36:36:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    36:36:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):22 -> a
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):22:22 -> a
-    38:39:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Iterable):22:23 -> a
-    40:42:java.util.List com.android.tools.r8.utils.ListUtils.map(java.util.Collection,java.util.function.Function):25:27 -> a
-    43:43:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(int):28:28 -> a
-    44:46:java.util.Set com.android.tools.r8.utils.SetUtils.mapIdentityHashSet(java.util.Set,java.util.function.Function):38:40 -> a
-    47:47:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):57:57 -> a
-    48:48:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):56:56 -> a
-    49:49:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):55:55 -> a
-    50:57:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):58:65 -> a
-    58:64:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:67 -> a
-    65:66:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:62 -> a
-    67:76:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:70 -> a
-    77:84:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:68 -> a
-    85:87:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:63 -> a
-    88:91:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:64 -> a
-    92:97:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:66 -> a
-    98:106:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:69 -> a
-    107:130:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.map(java.lang.Class,java.lang.Object[],java.util.function.Function):83:106 -> a
-    131:131:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.map(java.lang.Class,java.lang.Object[],java.util.function.Function):105:105 -> a
-    132:144:void com.android.tools.r8.utils.ZipUtils.writeToZipStream(java.util.zip.ZipOutputStream,java.lang.String,com.android.tools.r8.ByteDataView,int):83:95 -> a
-    145:152:boolean com.android.tools.r8.utils.ZipUtils.isClassFile(java.lang.String):104:111 -> a
+    14:15:void rewriteHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):18:19 -> a
+    16:16:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> a
+    16:16:void rewriteHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):19 -> a
+    17:18:void rewriteHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):20:21 -> a
+    19:26:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):21:28 -> a
+    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):29 -> a
+    28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):26:26 -> a
+    29:29:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):26 -> a
+    30:30:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin) -> a
+    30:30:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> 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 -> a
+    31:31: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
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):22:22 -> a
+    33:33:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):22 -> a
+    34:34:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    34:34:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):22 -> a
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):22:22 -> a
+    36:37:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Iterable):22:23 -> a
+    38:38:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(int):28:28 -> a
+    39:41:java.util.Set com.android.tools.r8.utils.SetUtils.mapIdentityHashSet(java.util.Set,java.util.function.Function):38:40 -> a
+    42:42:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):57:57 -> a
+    43:43:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):56:56 -> a
+    44:44:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):55:55 -> a
+    45:52:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):58:65 -> a
+    53:59:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:67 -> a
+    60:61:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:62 -> a
+    62:71:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:70 -> a
+    72:79:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:68 -> a
+    80:82:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:63 -> a
+    83:86:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:64 -> a
+    87:92:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:66 -> a
+    93:101:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:69 -> a
+    102:125:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.map(java.lang.Class,java.lang.Object[],java.util.function.Function):83:106 -> a
+    126:126:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.map(java.lang.Class,java.lang.Object[],java.util.function.Function):105:105 -> a
+    127:139:void com.android.tools.r8.utils.ZipUtils.writeToZipStream(java.util.zip.ZipOutputStream,java.lang.String,com.android.tools.r8.ByteDataView,int):83:95 -> a
+    140:147:boolean com.android.tools.r8.utils.ZipUtils.isClassFile(java.lang.String):104:111 -> a
     boolean com.android.tools.r8.utils.NumberUtils.is32Bit(long) -> b
     1:2:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):16:17 -> b
     3:9:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteRequireNonNull(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):29:35 -> b
     10:11:boolean com.android.tools.r8.utils.ZipUtils.isDexFile(java.lang.String):99:100 -> b
     1:3:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteToArraysHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):19:21 -> c
-    4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> c
+    4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> c
     4:4:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteToArraysHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):21 -> c
     5:7:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteToArraysHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):22:24 -> c
 com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.D.d.f0.f:
@@ -35022,10 +35147,10 @@
     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:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMethodWithDynamicDispatch():1124:1124 -> a
     21:21:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):96 -> a
     22:31:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):97:106 -> a
-    32:32:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMethodWithDynamicDispatch():1120:1120 -> a
+    32:32:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMethodWithDynamicDispatch():1124:1124 -> a
     32:32:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):106 -> a
     33:33:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):108:108 -> a
     34:50:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):106:122 -> a
@@ -35038,7 +35163,7 @@
     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:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     108:108:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):193 -> a
     109:119:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):194:204 -> a
     120:120:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
@@ -35047,7 +35172,7 @@
     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:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     124:124:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):208 -> a
     125:138:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):210:223 -> a
     139:139:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
@@ -35084,7 +35209,7 @@
     2:33:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):106:137 -> a
     34:51:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):258:275 -> a
     34:51:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
-    52:52:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    52:52:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     52:52:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):281 -> a
     52:52:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
     53:54:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):281:282 -> a
@@ -35122,13 +35247,13 @@
     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():879:879 -> a
+    161:161:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     161:161:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):175 -> a
     162:188:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):176:202 -> a
-    189:189:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    189:189:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     189:189:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203 -> a
     190:190:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203:203 -> a
-    191:191:void com.android.tools.r8.utils.IteratorUtils.removeIf(com.android.tools.r8.ir.code.InstructionListIterator,java.util.function.Predicate):49:49 -> a
+    191:191:void com.android.tools.r8.utils.IteratorUtils.removeIf(com.android.tools.r8.ir.code.InstructionListIterator,java.util.function.Predicate):84:84 -> a
     191:191:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203 -> a
     192:231:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):209:248 -> a
     232:232:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
@@ -35150,12 +35275,12 @@
     586:587:boolean com.android.tools.r8.graph.DexClass.definesStaticField(com.android.tools.r8.graph.DexField):445:446 -> a
     586:587:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):365 -> a
     588:588:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):366:366 -> a
-    589:593:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():815:819 -> a
+    589:593:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():819:823 -> a
     589:593:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):371 -> a
     594:612:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):374:392 -> a
     613:616:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):487:490 -> a
     613:616:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):399 -> a
-    617:617:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    617:617:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     617:617:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):490 -> a
     617:617:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):399 -> a
     618:621:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):491:494 -> a
@@ -35164,7 +35289,7 @@
     630:630:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
     630:630:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):408 -> a
     631:640:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):409:418 -> a
-    641:641:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    641:641:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     641:641:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):490 -> a
     641:641:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):399 -> a
     642:674:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):421:453 -> a
@@ -35182,705 +35307,694 @@
     6:10:void execute():85:89 -> a
     11:11:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
     11:11:void execute():84 -> a
-com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.D.e.s:
+com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.D.e.r:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.utils.InternalOptions options -> d
     com.android.tools.r8.ir.conversion.IRConverter converter -> a
-    1:1:void <clinit>():147:147 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):166:170 -> <init>
-    boolean lambda$computeConstantArrayValues$11(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Instruction) -> a
-    1:1:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):244:244 -> a
-    2:25:void collapseTrivialGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.List):328:351 -> a
-    26:26:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):418:418 -> a
-    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():1271:1271 -> a
-    27:27:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):418 -> a
-    28:29:boolean com.android.tools.r8.ir.code.IRCode.hasCatchHandlers():580:581 -> a
-    28:29:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):418 -> a
-    30:41:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):425:436 -> a
+    1:1:void <clinit>():131:131 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):150:154 -> <init>
+    boolean lambda$computeConstantArrayValues$9(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Instruction) -> a
+    1:1:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):228:228 -> a
+    2:25:void collapseTrivialGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.List):312:335 -> a
+    26:26:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):402:402 -> a
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():1273:1273 -> a
+    27:27:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):402 -> a
+    28:29:boolean com.android.tools.r8.ir.code.IRCode.hasCatchHandlers():625:626 -> a
+    28:29:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):402 -> a
+    30:41:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):409:420 -> a
     42:42:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
-    42:42:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):436 -> a
-    43:50:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):437:444 -> a
-    51:87:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):596:632 -> a
-    88:88:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):460:460 -> a
-    88:88:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):633 -> a
-    89:103:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):634:648 -> a
-    104:104:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):460:460 -> a
-    104:104:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):649 -> a
-    105:114:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):650:659 -> a
-    115:128:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):709:722 -> a
-    129:129:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):719:719 -> a
-    130:141:void tryAddToBiggestSavings(java.util.Set,java.util.PriorityQueue,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,int):732:743 -> a
-    142:149:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):748:755 -> a
-    150:150:int codeUnitMargin():762:762 -> a
-    151:151:int lambda$rewriteSwitch$1(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):924:924 -> a
-    152:155:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1205:1208 -> a
-    156:162:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1207:1213 -> a
-    163:163:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1212:1212 -> a
-    164:217:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1229:1282 -> a
-    218:262:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1257:1301 -> a
-    263:329:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeClassInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):1458:1524 -> a
-    330:330:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):1555:1555 -> a
-    331:335:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):1558:1562 -> a
-    336:351:boolean isKotlinNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):1617:1632 -> a
-    336:351:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):1564 -> a
-    352:371:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):1565:1584 -> a
-    372:377:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):1583:1588 -> a
-    378:385:boolean isInstantiationOfNullPointerException(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.graph.DexItemFactory):1651:1658 -> a
-    378:385:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):1588 -> a
-    386:406:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):1589:1609 -> a
-    407:409:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1640:1642 -> a
-    410:410:boolean triggersClassInitializationBeforeSideEffect(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1672:1672 -> a
-    411:427:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$triggersClassInitializationBeforeSideEffect$4(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):1675:1691 -> a
-    428:487:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):1703:1762 -> a
-    488:528:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):1722:1762 -> a
-    529:542:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):1749:1762 -> a
-    543:543:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1770:1770 -> a
-    544:544: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
-    544:544:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1769 -> a
-    545:551:com.android.tools.r8.graph.DexType getArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1780:1786 -> a
-    545:551:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1773 -> a
-    552:552:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1773:1773 -> a
-    553:553: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
-    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():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
-    591:591: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):1964:1964 -> a
-    592:599:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2106:2113 -> a
-    600:600: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
-    600:600:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2113 -> a
-    601:601:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    601:601:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2114 -> a
-    602:602:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2116:2116 -> a
-    603:603:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    603:603:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2117 -> a
-    604:605:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2118:2119 -> a
-    606:606:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    606:606:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2119 -> a
-    607:624:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2120:2137 -> a
-    625:640:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2136:2151 -> a
-    641:641:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    641:641:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2152 -> a
-    642:643:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2153:2154 -> a
-    644:644:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    644:644:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2155 -> a
-    645:658:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2156:2169 -> a
-    659:659:boolean lambda$removeInstanceOfInstructionIfTrivial$5(com.android.tools.r8.ir.code.Value):2148:2148 -> a
-    660:665:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):2176:2181 -> a
-    666:676:void removeOrReplaceByDebugLocalWrite(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2186:2196 -> a
-    677:678:boolean lambda$shortenLiveRanges$7(com.android.tools.r8.ir.code.ConstInstruction):2367:2368 -> a
-    679:680:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):2431:2432 -> a
-    681:681:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    681:681:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):2433 -> a
-    682:704:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):2434:2456 -> a
-    705:705:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    705:705:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):2457 -> a
-    706:719:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):2458:2471 -> a
-    720:720:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
-    720:720:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):2476 -> a
-    721:764:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):2480:2523 -> a
-    765:775:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):2528:2538 -> a
-    776:776:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
-    776:776:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):2538 -> a
-    777:777:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):2539:2539 -> a
-    778:778:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    778:778:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):2540 -> a
-    779:781:boolean lambda$insertConstantInBlock$10(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):2534:2536 -> a
-    782:782:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():1232:1232 -> a
-    782:782:boolean lambda$insertConstantInBlock$10(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):2537 -> a
-    783:783:boolean lambda$insertConstantInBlock$10(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):2537:2537 -> a
-    784:831:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):2575:2622 -> a
-    832:837:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2950:2955 -> a
-    838:838:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2971:2971 -> a
-    839:845:boolean hasCSECandidate(com.android.tools.r8.ir.code.IRCode,int):2959:2965 -> a
-    839:845:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2972 -> a
-    846:848:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2974:2976 -> a
-    849:849:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
-    849:849:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2976 -> a
-    850:856:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2977:2983 -> a
-    857:857:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    857:857:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2984 -> a
-    858:863:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2985:2990 -> a
-    864:873:boolean shareCatchHandlers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2937:2946 -> a
-    864:873:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2991 -> a
-    874:889:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2992:3007 -> a
-    890:891:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):3138:3139 -> a
-    892:892:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):3304:3304 -> a
-    893:893:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1009:1009 -> a
-    893:893:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):3304 -> a
-    894:895:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):3304:3305 -> a
-    896:923: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):3315:3342 -> a
-    924:924:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1009:1009 -> a
-    924:924: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):3346 -> a
-    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: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
-    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:66:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3386:3397 -> b
-    67:67:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> b
-    67:67:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3398 -> b
-    68:86:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3399:3417 -> b
-    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):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
-    99:99:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3434 -> b
-    100:100:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3437:3437 -> b
-    101:101:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> b
-    101:101:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3438 -> b
-    102:103:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):3439:3440 -> b
-    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):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
-    95:95:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1324:1324 -> c
-    96:96:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1320:1320 -> c
-    97:100:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2289:2292 -> c
-    101:109:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2307:2315 -> c
-    101:109:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2293 -> c
-    110:110:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> c
-    110:110:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2315 -> c
-    110:110:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2293 -> c
-    111:113:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2315:2317 -> c
-    111:113:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2293 -> c
-    114:121:boolean hasPath(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2338:2345 -> c
-    114:121:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2318 -> c
-    114:121:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2293 -> c
-    122:123:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2323:2324 -> c
-    122:123:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2293 -> c
-    124:124:java.util.List lambda$shortenLiveRangesInsideBlock$9(com.android.tools.r8.ir.code.BasicBlock):2517:2517 -> c
-    125:175:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3164:3214 -> c
-    176:176:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1009:1009 -> c
-    176:176:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3215 -> c
-    177:186:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3217:3226 -> c
-    187:187:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3225:3225 -> c
-    188:188:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1009:1009 -> c
-    188:188:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3232 -> c
-    189:189:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3235:3235 -> c
-    190:203:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3234:3247 -> c
-    204:204:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3246:3246 -> c
-    205:205:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1009:1009 -> c
-    205:205:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3253 -> c
-    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():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):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
+    42:42:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):420 -> a
+    43:43:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.InstructionListIterator.split(com.android.tools.r8.ir.code.IRCode,int):126:126 -> a
+    43:43:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):421 -> a
+    44:49:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):423:428 -> a
+    50:86:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):580:616 -> a
+    87:87:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):444:444 -> a
+    87:87:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):617 -> a
+    88:102:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):618:632 -> a
+    103:103:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):444:444 -> a
+    103:103:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):633 -> a
+    104:113:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):634:643 -> a
+    114:127:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):693:706 -> a
+    128:128:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):703:703 -> a
+    129:140:void tryAddToBiggestSavings(java.util.Set,java.util.PriorityQueue,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,int):716:727 -> a
+    141:148:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):732:739 -> a
+    149:149:int codeUnitMargin():746:746 -> a
+    150:150:int lambda$rewriteSwitch$1(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):908:908 -> a
+    151:151:void lambda$removeSwitchMaps$2(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1082:1082 -> a
+    152:152:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1146:1146 -> a
+    153:153:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    153:153:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1145 -> a
+    154:160:com.android.tools.r8.graph.DexType getArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1156:1162 -> a
+    154:160:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1149 -> a
+    161:161:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1149:1149 -> a
+    162:162:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    162:162:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1148 -> a
+    163:165:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1150:1152 -> a
+    166:179:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1306:1319 -> a
+    180:180:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
+    180:180:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1324 -> a
+    181:185:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1325:1329 -> a
+    186:186:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    186:186:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1330 -> a
+    187:199:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1330:1342 -> a
+    200:200:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    200:200:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1341 -> a
+    201:201:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1340:1340 -> a
+    202:209:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1482:1489 -> a
+    210:210:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    210:210:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1489 -> a
+    211:211:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    211:211:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1490 -> a
+    212:212:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1492:1492 -> a
+    213:213:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    213:213:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1493 -> a
+    214:215:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1494:1495 -> a
+    216:216:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
+    216:216:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1495 -> a
+    217:234:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1496:1513 -> a
+    235:250:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1512:1527 -> a
+    251:251:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    251:251:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1528 -> a
+    252:253:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1529:1530 -> a
+    254:254:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
+    254:254:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1531 -> a
+    255:268:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1532:1545 -> a
+    269:269:boolean lambda$removeInstanceOfInstructionIfTrivial$3(com.android.tools.r8.ir.code.Value):1524:1524 -> a
+    270:275:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1552:1557 -> a
+    276:286:void removeOrReplaceByDebugLocalWrite(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1562:1572 -> a
+    287:288:boolean lambda$shortenLiveRanges$5(com.android.tools.r8.ir.code.ConstInstruction):1738:1739 -> a
+    289:290:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1802:1803 -> a
+    291:291:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    291:291:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1804 -> a
+    292:314:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1805:1827 -> a
+    315:315:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    315:315:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1828 -> a
+    316:329:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1829:1842 -> a
+    330:330:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    330:330:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1847 -> a
+    331:374:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1851:1894 -> a
+    375:385:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):1899:1909 -> a
+    386:386:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    386:386:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):1909 -> a
+    387:387:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):1910:1910 -> a
+    388:388:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    388:388:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):1911 -> a
+    389:391:boolean lambda$insertConstantInBlock$8(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):1905:1907 -> a
+    392:392:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():1234:1234 -> a
+    392:392:boolean lambda$insertConstantInBlock$8(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):1908 -> a
+    393:393:boolean lambda$insertConstantInBlock$8(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):1908:1908 -> a
+    394:441:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):1946:1993 -> a
+    442:447:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2321:2326 -> a
+    448:448:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2342:2342 -> a
+    449:455:boolean hasCSECandidate(com.android.tools.r8.ir.code.IRCode,int):2330:2336 -> a
+    449:455:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2343 -> a
+    456:458:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2345:2347 -> a
+    459:459:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
+    459:459:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2347 -> a
+    460:466:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2348:2354 -> a
+    467:467:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    467:467:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2355 -> a
+    468:473:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2356:2361 -> a
+    474:483:boolean shareCatchHandlers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2308:2317 -> a
+    474:483:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2362 -> a
+    484:499:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2363:2378 -> a
+    500:501:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2509:2510 -> a
+    502:502:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2675:2675 -> a
+    503:503:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> a
+    503:503:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2675 -> a
+    504:505:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2675:2676 -> a
+    506:533:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2686:2713 -> a
+    534:534:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> a
+    534:534:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2717 -> a
+    535:549:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2732:2746 -> a
+    550:575:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):2920:2945 -> a
+    576:580:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):2956:2960 -> a
+    581:601:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3117:3137 -> a
+    602:602:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):40:40 -> a
+    602:602:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3137 -> a
+    603:619:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3137:3153 -> a
+    620:620:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    620:620:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3152 -> a
+    621:621:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    621:621:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3151 -> a
+    622:633:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3151:3162 -> a
+    634:656:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3173:3195 -> a
+    657:657:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167:167 -> a
+    657:657:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3195 -> a
+    658:658:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3196:3196 -> a
+    659:693:java.util.Set computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3233:3267 -> a
+    659:693:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3200 -> a
+    694:700:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3201:3207 -> a
+    701:701:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    701:701:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3208 -> a
+    702:716:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3209:3223 -> a
+    717:717:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):168:168 -> a
+    717:717:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3223 -> a
+    718:722:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3278:3282 -> a
+    723:723:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167:167 -> a
+    723:723:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3282 -> a
+    724:728:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3283:3287 -> a
+    729:729:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3340:3340 -> a
+    730:739:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3346:3355 -> a
+    730:739:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3342 -> a
+    740:740:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3352:3352 -> a
+    740:740:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3342 -> a
+    741:741:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    741:741:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3352 -> a
+    741:741:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3342 -> a
+    742:742:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3352:3352 -> a
+    742:742:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3342 -> a
+    743:744:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3361:3362 -> a
+    745:745:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    745:745:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3363 -> a
+    746:746:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3365:3365 -> a
+    747:747:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    747:747:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3365 -> a
+    748:749:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3365:3366 -> a
+    750:759:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3376:3385 -> a
+    760:760:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    760:760:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3386 -> a
+    761:761:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.InstructionListIterator.split(com.android.tools.r8.ir.code.IRCode):99:99 -> a
+    761:761:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3387 -> a
+    762:762:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    762:762:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3388 -> a
+    763:764:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3391:3392 -> a
+    765:765:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    765:765:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3392 -> a
+    766:766:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3393:3393 -> a
+    767:767:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    767:767:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3393 -> a
+    768:768:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3396:3396 -> a
+    769:769:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    769:769:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3396 -> a
+    770:770:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    770:770:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3395 -> a
+    771:772:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3398:3399 -> a
+    773:773:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> a
+    773:773:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3399 -> a
+    774:774:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3400:3400 -> a
+    775:775:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> a
+    775:775:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3400 -> a
+    776:776:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3402:3402 -> a
+    777:777:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1242:1242 -> a
+    777:777:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3404 -> a
+    778:778:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3404:3404 -> a
+    779:779:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    779:779:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3402 -> a
+    780:781:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3406:3407 -> a
+    782:782:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    782:782:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3407 -> a
+    783:784:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3409:3410 -> a
+    785:785:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    785:785:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3410 -> a
+    786:794:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3412:3420 -> a
+    795:795:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    795:795:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3420 -> a
+    796:815:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3421:3440 -> a
+    816:819:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata):1392:1395 -> a
+    816:819:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3440 -> a
+    820:839:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3441:3460 -> a
+    840:840:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    840:840:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3460 -> a
+    841:843:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3461:3463 -> a
+    844:844:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    844:844:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3463 -> a
+    845:846:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3464:3465 -> a
+    847:847:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    847:847:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3464 -> a
+    848:848:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3466:3466 -> a
+    849:849:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    849:849:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3466 -> a
+    850:853:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3469:3472 -> a
+    854:854:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    854:854:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3472 -> a
+    855:855:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3474:3474 -> a
+    856:856:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    856:856:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3474 -> a
+    857:857:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3479:3479 -> a
+    858:865:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3483:3490 -> a
+    866:876:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3503:3513 -> a
+    866:876:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    877:877:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3491:3491 -> a
+    878:903:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):3536:3561 -> a
+    878:903:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3491 -> a
+    904:908:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3492:3496 -> a
+    909:909:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3493:3493 -> a
+    910:910:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    910:910:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3493 -> a
+    911:911:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    911:911:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    911:911:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3493 -> a
+    912:912:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3493:3493 -> a
+    913:913:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3511:3511 -> a
+    913:913:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    914:914:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    914:914:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3511 -> a
+    914:914:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    915:915:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    915:915:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    915:915:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3511 -> a
+    915:915:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    916:916:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3511:3511 -> a
+    916:916:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    917:917:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3507:3507 -> a
+    917:917:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    918:918:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    918:918:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3507 -> a
+    918:918:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    919:919:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    919:919:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    919:919:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3507 -> a
+    919:919:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    920:920:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3507:3507 -> a
+    920:920:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    921:927:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):3517:3523 -> a
+    1:2:boolean isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):300:301 -> b
+    3:12:void unlinkTrivialGotoBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):340:349 -> b
+    13:13:boolean lambda$shortenLiveRanges$6(com.android.tools.r8.ir.code.ConstInstruction):1747:1747 -> b
+    14:25:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2757:2768 -> b
+    26:26:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> b
+    26:26:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2769 -> b
+    27:45:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2770:2788 -> b
+    46:46:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> b
+    46:46:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2796 -> b
+    47:53:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2797:2803 -> b
+    54:55:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1055:1056 -> b
+    54:55:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2803 -> b
+    56:57:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2804:2805 -> b
+    58:58:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> b
+    58:58:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2805 -> b
+    59:59:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2808:2808 -> b
+    60:60:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> b
+    60:60:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2809 -> b
+    61:62:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2810:2811 -> b
+    63:63:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> b
+    63:63:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2776 -> b
+    64:65:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2814:2815 -> b
+    66:66:boolean lambda$logArgumentTypes$12(com.android.tools.r8.ir.code.Instruction):3385:3385 -> b
+    67:69:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$13():3624:3626 -> b
+    70:70:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$13():3624:3624 -> b
+    1:4:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1660:1663 -> c
+    5:13:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1678:1686 -> c
+    5:13:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
+    14:14:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> c
+    14:14:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1686 -> c
+    14:14:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
+    15:17:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1686:1688 -> c
+    15:17:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
+    18:25:boolean hasPath(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):1709:1716 -> c
+    18:25:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1689 -> c
+    18:25:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
+    26:27:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1694:1695 -> c
+    26:27:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
+    28:28:java.util.List lambda$shortenLiveRangesInsideBlock$7(com.android.tools.r8.ir.code.BasicBlock):1888:1888 -> c
+    29:79:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2535:2585 -> c
+    80:80:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> c
+    80:80:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2586 -> c
+    81:90:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2588:2597 -> c
+    91:91:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2596:2596 -> c
+    92:92:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> c
+    92:92:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2603 -> c
+    93:93:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2606:2606 -> c
+    94:107:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2605:2618 -> c
+    108:108:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2617:2617 -> c
+    109:109:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> c
+    109:109:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2624 -> c
+    110:110:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2627:2627 -> c
+    111:130:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2626:2645 -> c
+    1:1:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):167:167 -> d
+    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> d
+    2:2:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):169 -> d
+    3:25:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):171:193 -> d
+    26:26:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1089:1089 -> d
+    26:26:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):205 -> d
+    27:28:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):208:209 -> d
     29:29:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> d
-    29:29:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):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
+    29:29:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):209 -> d
+    30:33:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):209:212 -> d
+    1:6:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1049:1054 -> e
     7:45:com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo com.android.tools.r8.ir.optimize.SwitchUtils.analyzeSwitchOverEnum(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):63:101 -> e
-    7:45:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1070 -> e
-    46:53:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1072:1079 -> e
+    7:45:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1054 -> e
+    46:53:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1056:1063 -> e
     54:54:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> e
     54:54:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> e
-    54:54:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1079 -> e
-    55:66:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1080:1091 -> e
+    54:54:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1063 -> e
+    55:66:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1064:1075 -> e
     67:67:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> e
-    67:67:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1093 -> e
-    68:76:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1096:1104 -> e
+    67:67:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1077 -> e
+    68:76:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1080:1088 -> e
     77:77:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> e
-    77:77:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1070 -> e
-    1:27:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1978:2004 -> f
+    77:77:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1054 -> e
+    1:27:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1354:1380 -> f
     28:28:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> f
-    28:28:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):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():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
-    37:50:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2013 -> f
-    51:51:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtCheckCastVerifierBug():1399:1399 -> f
-    51:51:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):2055 -> f
-    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
+    28:28:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1380 -> f
+    29:29:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1381:1381 -> f
+    30:30:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> f
+    30:30:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1382 -> f
+    31:36:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1384:1389 -> f
+    37:50:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1418:1431 -> f
+    37:50:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    51:51:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtCheckCastVerifierBug():1401:1401 -> f
+    51:51:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1431 -> f
+    51:51:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    52:54:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1432:1434 -> f
+    52:54:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
     55:55:boolean com.android.tools.r8.graph.DexType.isFloatType():216:216 -> f
-    55:55:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):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
-    56:63:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2013 -> f
+    55:55:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1434 -> f
+    55:55:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    56:63:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1435:1442 -> f
+    56:63:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
     64:64:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> f
-    64:64:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):2066 -> f
-    64:64:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2013 -> f
-    65:93:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):2068:2096 -> f
-    65:93:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2013 -> f
+    64:64:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1442 -> f
+    64:64:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    65:93:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1444:1472 -> f
+    65:93:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
     94:94:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> f
-    94:94:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):2096 -> f
-    94:94:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2013 -> f
-    95:97:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):2096:2098 -> f
-    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():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
-    19:19:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3660 -> g
-    20:61:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3661:3702 -> g
-    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():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
-    14:14:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3723 -> h
-    15:29:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3724:3738 -> h
-    30:30:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> h
-    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():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
+    94:94:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1472 -> f
+    94:94:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    95:97:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1472:1474 -> f
+    95:97:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    98:120:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1390:1412 -> f
+    1:1:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3011:3011 -> g
+    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> g
+    2:2:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3015 -> g
+    3:18:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3016:3031 -> g
+    19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> g
+    19:19:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3031 -> g
+    20:61:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3032:3073 -> g
+    62:62:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> g
+    62:62:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3031 -> g
+    63:63:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3078:3078 -> g
+    1:1:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> h
+    1:1:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3082 -> h
+    2:13:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3083:3094 -> h
+    14:14:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> h
+    14:14:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3094 -> h
+    15:27:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3095:3107 -> h
+    28:28:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> h
+    28:28:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3108 -> h
+    29:29:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3109:3109 -> h
+    30:30:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> h
+    30:30:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3094 -> h
+    31:31:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3113:3113 -> h
+    1:1:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1167:1167 -> i
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> i
+    2:2:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1167 -> i
+    3:14:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1170:1181 -> i
     15:15:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> i
-    15:15:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1806 -> i
-    16:36:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1807:1827 -> i
-    37:72:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1826:1861 -> i
+    15:15:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1182 -> i
+    16:36:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1183:1203 -> i
+    37:72:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1202:1237 -> i
     73:73:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> i
-    73:73:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1844 -> i
-    74:76:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1870:1872 -> i
-    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
+    73:73:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1220 -> i
+    74:76:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1246:1248 -> i
+    77:77:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):475:475 -> i
+    77:77:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1249 -> i
+    78:84:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1250:1256 -> i
     85:85:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> i
-    85:85:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):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
+    85:85:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1256 -> i
+    86:88:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1256:1258 -> i
+    1:10:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):843:852 -> j
     11:11:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> j
-    11:11:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):869 -> j
-    12:14:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):870:872 -> j
-    15:22:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1017:1024 -> j
-    15:22:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):874 -> j
-    23:25:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.IntSwitch,int):1043:1045 -> j
-    23:25:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1028 -> j
-    23:25:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):874 -> j
-    26:34:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1029:1037 -> j
-    26:34:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):874 -> j
-    35:35:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):876:876 -> j
+    11:11:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):853 -> j
+    12:14:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):854:856 -> j
+    15:22:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1001:1008 -> j
+    15:22:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):858 -> j
+    23:25:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.IntSwitch,int):1027:1029 -> j
+    23:25:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1012 -> j
+    23:25:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):858 -> j
+    26:34:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1013:1021 -> j
+    26:34:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):858 -> j
+    35:35:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):860:860 -> j
     36:36:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> j
-    36:36:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):880 -> j
+    36:36:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):864 -> j
     37:37:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> j
-    37:37:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):881 -> j
-    38:57:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):882:901 -> j
-    58:58:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> j
-    58:58:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):902 -> j
-    59:59:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> j
-    59:59:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):903 -> j
-    60:60:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> j
-    60:60:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):904 -> j
-    61:84:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):905:928 -> j
-    85:85:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
-    85:85:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):928 -> j
-    86:100:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):929:943 -> j
-    101:101:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
-    101:101:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):943 -> j
-    102:138:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):945:981 -> j
-    139:139:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
-    139:139:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):981 -> j
-    140:140:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):983:983 -> j
-    141:155:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):767:781 -> j
-    141:155:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):984 -> j
-    156:156:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> j
-    156:156:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):781 -> j
-    156:156:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):984 -> j
-    157:168:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):787:798 -> j
-    157:168:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):984 -> j
-    169:169:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
-    169:169:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):798 -> j
-    169:169:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):984 -> j
-    170:219:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):799:848 -> j
-    170:219:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):984 -> j
-    220:220:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> j
-    220:220:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):849 -> j
-    220:220:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):984 -> j
-    221:221:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):854:854 -> j
-    221:221:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):984 -> j
-    222:246:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):988:1012 -> j
-    1:3:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):255:257 -> k
+    37:37:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):865 -> j
+    38:56:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):866:884 -> j
+    57:57:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> j
+    57:57:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):884 -> j
+    58:58:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):885:885 -> j
+    59:59:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> j
+    59:59:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):886 -> j
+    60:60:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> j
+    60:60:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):887 -> j
+    61:61:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> j
+    61:61:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):888 -> j
+    62:85:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):889:912 -> j
+    86:86:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
+    86:86:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):912 -> j
+    87:101:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):913:927 -> j
+    102:102:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
+    102:102:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):927 -> j
+    103:139:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):929:965 -> j
+    140:140:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
+    140:140:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):965 -> j
+    141:141:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):967:967 -> j
+    142:156:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):751:765 -> j
+    142:156:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    157:157:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> j
+    157:157:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):765 -> j
+    157:157:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    158:169:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):771:782 -> j
+    158:169:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    170:170:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
+    170:170:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):782 -> j
+    170:170:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    171:220:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):783:832 -> j
+    171:220:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    221:221:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> j
+    221:221:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):833 -> j
+    221:221:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    222:222:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):838:838 -> j
+    222:222:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    223:247:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):972:996 -> j
+    1:3:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):239:241 -> k
     4:4:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> k
-    4:4:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):258 -> k
-    5:10:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):261:266 -> k
+    4:4:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):242 -> k
+    5:10:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):245:250 -> k
     11:11:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> k
-    11:11:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):267 -> k
-    12:19:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):271:278 -> k
+    11:11:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):251 -> k
+    12:19:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):255:262 -> k
     20:20:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> k
-    20:20:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):279 -> k
-    21:35:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):282:296 -> k
+    20:20:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):263 -> k
+    21:35:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):266:280 -> k
     36:36:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> k
-    36:36:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):297 -> k
-    37:37:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):298:298 -> k
+    36:36:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):281 -> k
+    37:37:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):282:282 -> k
     38:38:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> k
-    38:38:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):299 -> k
-    39:39:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):300:300 -> k
+    38:38:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):283 -> k
+    39:39:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):284:284 -> k
     40:40:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> k
-    40:40:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):302 -> k
+    40:40:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):286 -> k
     41:41:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> k
-    41:41:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):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):3926:3930 -> l
+    41:41:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):287 -> k
+    42:42:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):296:296 -> k
+    1:5:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3297:3301 -> l
     6:6:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> l
-    6:6:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):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):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):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):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
+    6:6:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3302 -> l
+    7:17:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3303:3313 -> l
+    18:18:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> l
+    18:18:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3320 -> l
+    19:20:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3321:3322 -> l
+    21:21:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> l
+    21:21:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3323 -> l
+    22:22:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> l
+    22:22:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3324 -> l
+    23:23:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> l
+    23:23:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3327 -> l
+    24:32:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3328:3336 -> l
+    1:55:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1724:1778 -> m
     56:56:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> m
-    56:56:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2407 -> m
+    56:56:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1778 -> m
     57:57:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> m
-    57:57:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2408 -> m
-    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():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
+    57:57:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1779 -> m
+    58:60:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1780:1782 -> m
+    61:87:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1767:1793 -> m
+    1:1:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2023:2023 -> n
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> n
+    2:2:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2023 -> n
+    3:9:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2026:2032 -> n
     10:10:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> n
-    10:10:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2662 -> n
-    11:11:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2663:2663 -> n
-    12:28:boolean allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):2628:2644 -> n
-    12:28:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2664 -> n
-    29:45:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2667:2683 -> n
-    46:63:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2682:2699 -> n
-    64:80:short[] computeArrayFilledData(com.android.tools.r8.ir.code.ConstInstruction[],int,int):2548:2564 -> n
-    64:80:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2700 -> n
-    81:87:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2704:2710 -> n
+    10:10:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2033 -> n
+    11:11:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2034:2034 -> n
+    12:28:boolean allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):1999:2015 -> n
+    12:28:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2035 -> n
+    29:45:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2038:2054 -> n
+    46:63:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2053:2070 -> n
+    64:80:short[] computeArrayFilledData(com.android.tools.r8.ir.code.ConstInstruction[],int,int):1919:1935 -> n
+    64:80:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2071 -> n
+    81:87:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2075:2081 -> n
     88:88:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> n
-    88:88:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2711 -> n
-    89:99:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2712:2722 -> n
+    88:88:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2082 -> n
+    89:99:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2083:2093 -> n
     100:100:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> n
-    100:100:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2723 -> n
-    101:115:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2724:2738 -> n
+    100:100:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2094 -> n
+    101:115:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2095:2109 -> n
     116:116:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> n
-    116:116:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2739 -> n
-    117:122:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2745:2750 -> n
-    1:6:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2787:2792 -> o
-    7:9:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2831:2833 -> o
-    7:9:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2792 -> o
+    116:116:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2110 -> n
+    117:122:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2116:2121 -> n
+    1:6:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2158:2163 -> o
+    7:9:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2202:2204 -> o
+    7:9:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2163 -> o
     10:10:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> o
-    10:10:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2834 -> o
-    10:10:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2792 -> o
-    11:25:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2835:2849 -> o
-    11:25:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2792 -> o
-    26:28:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2797:2799 -> o
+    10:10:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2205 -> o
+    10:10:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2163 -> o
+    11:25:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2206:2220 -> o
+    11:25:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2163 -> o
+    26:28:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2168:2170 -> o
     29:29:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> o
-    29:29:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2800 -> o
-    30:36:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2801:2807 -> o
-    37:59:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2756:2778 -> o
-    37:59:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2809 -> o
-    60:73:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2810:2823 -> o
-    74:74:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2783:2783 -> o
-    74:74:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2809 -> o
-    1:6:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3011:3016 -> p
-    7:23:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3619:3635 -> p
-    7:23:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3017 -> p
-    24:35:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3593:3604 -> p
-    24:35:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3018 -> p
+    29:29:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2171 -> o
+    30:36:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2172:2178 -> o
+    37:59:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2127:2149 -> o
+    37:59:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2180 -> o
+    60:73:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2181:2194 -> o
+    74:74:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2154:2154 -> o
+    74:74:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2180 -> o
+    1:6:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2382:2387 -> p
+    7:23:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2990:3006 -> p
+    7:23:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2388 -> p
+    24:35:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2964:2975 -> p
+    24:35:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
     36:49:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():27:40 -> p
-    36:49:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3604 -> p
-    36:49:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3018 -> p
+    36:49:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    36:49:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
     50:50:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():38:38 -> p
-    50:50:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3604 -> p
-    50:50:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3018 -> p
+    50:50:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    50:50:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
     51:51:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():36:36 -> p
-    51:51:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3604 -> p
-    51:51:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3018 -> p
+    51:51:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    51:51:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
     52:52:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():34:34 -> p
-    52:52:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3604 -> p
-    52:52:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3018 -> p
+    52:52:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    52:52:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
     53:53:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():32:32 -> p
-    53:53:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3604 -> p
-    53:53:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3018 -> p
-    54:62:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3604:3612 -> p
-    54:62:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3018 -> p
-    63:65:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3478:3480 -> p
-    63:65:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3020 -> p
-    66:66:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1009:1009 -> p
-    66:66:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3480 -> p
-    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():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
-    103:124:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3020 -> p
-    125:149:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3025:3049 -> p
-    150:150:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):3143:3143 -> p
-    150:150:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3050 -> p
-    151:165:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3053:3067 -> p
-    166:166:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):3143:3143 -> p
-    166:166:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3068 -> p
-    167:167:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3059:3059 -> p
-    168:168:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):3143:3143 -> p
-    168:168:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3060 -> p
-    169:179:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3075:3085 -> p
-    180:180:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):3143:3143 -> p
-    180:180:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3086 -> p
-    181:196:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3089:3104 -> p
-    197:197:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):3143:3143 -> p
-    197:197:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3105 -> p
-    198:198:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3095:3095 -> p
-    199:199:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):3143:3143 -> p
-    199:199:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3096 -> p
-    200:203:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3115:3118 -> p
-    204:204:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):3143:3143 -> p
-    204:204:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3119 -> p
-    205:205:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3121:3121 -> p
+    53:53:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    53:53:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    54:62:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975:2983 -> p
+    54:62:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    63:65:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2849:2851 -> p
+    63:65:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    66:66:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> p
+    66:66:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2851 -> p
+    66:66:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    67:101:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2852:2886 -> p
+    67:101:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    102:102:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> p
+    102:102:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2887 -> p
+    102:102:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    103:124:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2889:2910 -> p
+    103:124:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    125:149:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2396:2420 -> p
+    150:150:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    150:150:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2421 -> p
+    151:165:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2424:2438 -> p
+    166:166:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    166:166:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2439 -> p
+    167:167:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2430:2430 -> p
+    168:168:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    168:168:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2431 -> p
+    169:179:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2446:2456 -> p
+    180:180:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    180:180:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2457 -> p
+    181:196:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2460:2475 -> p
+    197:197:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    197:197:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2476 -> p
+    198:198:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2466:2466 -> p
+    199:199:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    199:199:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2467 -> p
+    200:203:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2486:2489 -> p
+    204:204:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    204:204:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2490 -> p
+    205:205:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2492:2492 -> p
     206:206:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> p
-    206:206:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3121 -> p
-    207:207:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):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
+    206:206:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2492 -> p
+    207:207:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    207:207:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2493 -> p
+    208:210:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2499:2501 -> p
     211:211:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> p
-    211:211:void simplifyIf(com.android.tools.r8.ir.code.IRCode):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
+    211:211:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2501 -> p
+    212:214:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2501:2503 -> p
+    1:3:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1580:1582 -> q
     4:4:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> q
-    4:4:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):2212 -> q
-    5:6:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):2213:2214 -> q
+    4:4:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1583 -> q
+    5:6:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1584:1585 -> q
     7:7:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> q
-    7:7:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):2215 -> q
-    8:16:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):2216:2224 -> q
+    7:7:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1586 -> q
+    8:16:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1587:1595 -> q
     17:17:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> q
-    17:17:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):2225 -> q
-    18:23:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):2226:2231 -> q
+    17:17:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1596 -> q
+    18:23:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1597:1602 -> q
     24:24:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> q
-    24:24:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):2234 -> q
-    25:25:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):2238:2238 -> q
-    1:3:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2249:2251 -> r
+    24:24:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1605 -> q
+    25:25:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1609:1609 -> q
+    1:3:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1620:1622 -> r
     4:4:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> r
-    4:4:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2252 -> r
-    5:23:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2253:2271 -> r
+    4:4:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1623 -> r
+    5:23:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1624:1642 -> r
     24:24:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> r
-    24:24:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2272 -> r
+    24:24:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1643 -> r
     25:25:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> r
-    25:25:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):2273 -> r
+    25:25:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1644 -> r
     26:26:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> r
-    26:26:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):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):4252:4286 -> s
+    26:26:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1645 -> r
+    27:45:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1633:1651 -> r
+    1:35:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3623:3657 -> s
     36:36:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> s
-    36:36:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):4286 -> s
+    36:36:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3657 -> s
     37:37:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> s
-    37:37:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):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
-    35:35:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1134:1134 -> t
-    36:49:void collapseNonFallthroughSwitchTargets(com.android.tools.r8.ir.code.BasicBlock):395:408 -> t
-    36:49:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1135 -> t
-    50:50:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):430:430 -> t
-    50:50:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1139 -> t
-    51:58:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1141:1148 -> t
-    59:59:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):430:430 -> t
-    59:59:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1152 -> t
-    60:61:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1154:1155 -> t
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):3280:3280 -> u
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$12(com.android.tools.r8.ir.code.IRCode):3175 -> u
+    37:37:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3658 -> s
+    38:45:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3661:3668 -> s
+    1:15:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1101:1115 -> t
+    16:34:void collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):355:373 -> t
+    16:34:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1116 -> t
+    35:35:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1118:1118 -> t
+    36:49:void collapseNonFallthroughSwitchTargets(com.android.tools.r8.ir.code.BasicBlock):379:392 -> t
+    36:49:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1119 -> t
+    50:50:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):475:475 -> t
+    50:50:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1123 -> t
+    51:58:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1125:1132 -> t
+    59:59:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):475:475 -> t
+    59:59:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1136 -> t
+    60:61:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1138:1139 -> t
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2651:2651 -> u
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2546 -> u
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.<init>():119:119 -> u
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):3280 -> u
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$12(com.android.tools.r8.ir.code.IRCode):3175 -> u
-    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):3283:3296 -> u
-    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$12(com.android.tools.r8.ir.code.IRCode):3175 -> u
-    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$13(com.android.tools.r8.ir.code.IRCode):3176:3176 -> v
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2651 -> u
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2546 -> u
+    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2654:2667 -> u
+    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2546 -> u
+    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$11(com.android.tools.r8.ir.code.IRCode):2547:2547 -> v
     2:2:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> v
-    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$13(com.android.tools.r8.ir.code.IRCode):3176 -> v
-    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$6(com.android.tools.r8.ir.code.IRCode):2354:2354 -> w
+    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$11(com.android.tools.r8.ir.code.IRCode):2547 -> v
+    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.IRCode):1725:1725 -> w
     2:2:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> w
-    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$6(com.android.tools.r8.ir.code.IRCode):2354 -> w
-    1:13:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):232:244 -> x
-    14:20:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):241:247 -> x
+    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.IRCode):1725 -> w
+    1:13:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):216:228 -> x
+    14:20:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):225:231 -> x
 com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.D.e.i:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
-    1:1:void <clinit>():3053:3053 -> <clinit>
+    1:1:void <clinit>():2424:2424 -> <clinit>
 com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.D.e.j:
     com.android.tools.r8.utils.InternalOptions options -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():2853:2853 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.CodeRewriter$1):2853:2853 -> <init>
-    2:3:void <init>(com.android.tools.r8.utils.InternalOptions):2857:2858 -> <init>
-    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):2853:2853 -> a
-    2:2:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2866:2866 -> a
-    2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):2853 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1204:1204 -> a
-    3:3:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2866 -> a
-    3:3:boolean doEquivalent(java.lang.Object,java.lang.Object):2853 -> a
-    4:19:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2870:2885 -> a
-    4:19:boolean doEquivalent(java.lang.Object,java.lang.Object):2853 -> a
-    20:20:int doHash(java.lang.Object):2853:2853 -> a
-    21:35:int doHash(com.android.tools.r8.ir.code.Instruction):2896:2910 -> a
-    21:35:int doHash(java.lang.Object):2853 -> a
-    36:41:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2917:2922 -> a
-    42:46:int getHashCode(com.android.tools.r8.ir.code.Value):2928:2932 -> a
+    1:1:void <clinit>():2224:2224 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.CodeRewriter$1):2224:2224 -> <init>
+    2:3:void <init>(com.android.tools.r8.utils.InternalOptions):2228:2229 -> <init>
+    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):2224:2224 -> a
+    2:2:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2237:2237 -> a
+    2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):2224 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1206:1206 -> a
+    3:3:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2237 -> a
+    3:3:boolean doEquivalent(java.lang.Object,java.lang.Object):2224 -> a
+    4:19:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2241:2256 -> a
+    4:19:boolean doEquivalent(java.lang.Object,java.lang.Object):2224 -> a
+    20:20:int doHash(java.lang.Object):2224:2224 -> a
+    21:35:int doHash(com.android.tools.r8.ir.code.Instruction):2267:2281 -> a
+    21:35:int doHash(java.lang.Object):2224 -> a
+    36:41:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2288:2293 -> a
+    42:46:int getHashCode(com.android.tools.r8.ir.code.Value):2299:2303 -> a
 com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.D.e.k:
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> g
     com.android.tools.r8.ir.code.BasicBlock target -> f
@@ -35888,64 +36002,60 @@
     com.android.tools.r8.ir.code.IRCode code -> c
     boolean $assertionsDisabled -> h
     int right -> e
-    1:1:void <clinit>():525:525 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRCode):533:534 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setLeft(com.android.tools.r8.ir.code.Value):543:543 -> a
-    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):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
+    1:1:void <clinit>():509:509 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRCode):517:518 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setLeft(com.android.tools.r8.ir.code.Value):527:527 -> a
+    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setRight(int):532:532 -> a
+    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):542:542 -> a
+    4:9:com.android.tools.r8.ir.code.BasicBlock build():547:552 -> a
+    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    10:10:com.android.tools.r8.ir.code.BasicBlock build():552 -> a
+    11:16:com.android.tools.r8.ir.code.BasicBlock build():553:558 -> a
+    17:20:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata):1392:1395 -> a
+    17:20:com.android.tools.r8.ir.code.BasicBlock build():558 -> a
+    21:23:com.android.tools.r8.ir.code.BasicBlock build():560:562 -> a
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):537:537 -> b
 com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult -> com.android.tools.r8.D.e.l:
     com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult FALSE -> c
     com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult TRUE -> b
     com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult UNKNOWN -> a
-    1:3:void <clinit>():150:152 -> <clinit>
-    1:1:void <init>(java.lang.String,int):149:149 -> <init>
+    1:3:void <clinit>():134:136 -> <clinit>
+    1:1:void <init>(java.lang.String,int):133:133 -> <init>
 com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.D.e.m:
     com.android.tools.r8.ir.code.Position position -> b
     int blockNumber -> a
-    1:2:void <init>(com.android.tools.r8.ir.code.Position):453:454 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect -> com.android.tools.r8.D.e.n:
-    com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect NO_EFFECT -> d
-    com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect DESIRED_EFFECT -> a
-    com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect OTHER_EFFECT -> c
-    com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect CONDITIONAL_EFFECT -> b
-    1:4:void <clinit>():1542:1545 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1541:1541 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.D.e.o:
+    1:2:void <init>(com.android.tools.r8.ir.code.Position):437:438 -> <init>
+com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.D.e.n:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList keys -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():662:662 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):666:666 -> <init>
-    2:8:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):664:670 -> <init>
-    1:1:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):683:683 -> a
-    2:2:int getMax():679:679 -> a
-    2:2:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):683 -> a
-    3:3:int getMin():675:675 -> a
-    3:3:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):683 -> a
-    4:5:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):683:684 -> a
-    6:6:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode):700:700 -> a
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList access$000(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):662:662 -> b
-    2:2:int getMax():679:679 -> b
-    2:2:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):688 -> b
-    3:3:int getMin():675:675 -> b
-    3:3:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):688 -> b
-    4:4:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):689:689 -> b
+    1:1:void <clinit>():646:646 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):650:650 -> <init>
+    2:8:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):648:654 -> <init>
+    1:1:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):667:667 -> a
+    2:2:int getMax():663:663 -> a
+    2:2:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):667 -> a
+    3:3:int getMin():659:659 -> a
+    3:3:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):667 -> a
+    4:5:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):667:668 -> a
+    6:6:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode):684:684 -> a
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList access$000(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):646:646 -> b
+    2:2:int getMax():663:663 -> b
+    2:2:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):672 -> b
+    3:3:int getMin():659:659 -> b
+    3:3:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):672 -> b
+    4:4:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):673:673 -> b
     5:5:int com.android.tools.r8.ir.code.IntSwitch.baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):114:114 -> b
-    5:5:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):693 -> b
-    6:6:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):693:693 -> b
+    5:5:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):677 -> b
+    6:6:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):677:677 -> b
     7:7:int com.android.tools.r8.ir.code.IntSwitch.basePackedSize(com.android.tools.r8.utils.InternalOutputMode):103:103 -> b
-    7:7:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):695 -> b
-    8:8:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):695:695 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult -> com.android.tools.r8.D.e.p:
+    7:7:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):679 -> b
+    8:8:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):679:679 -> b
+com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult -> com.android.tools.r8.D.e.o:
     com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult NO_REMOVALS -> a
     com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult REMOVED_CAST_DO_NARROW -> b
-    1:2:void <clinit>():1973:1974 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1972:1972 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$SCC -> com.android.tools.r8.D.e.q:
+    1:2:void <clinit>():1349:1350 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1348:1348 -> <init>
+com.android.tools.r8.ir.optimize.CodeRewriter$SCC -> com.android.tools.r8.D.e.p:
     java.util.Deque unassignedStack -> d
     java.util.Set unassignedSet -> c
     java.util.List components -> f
@@ -35953,27 +36063,27 @@
     java.util.Deque preorderStack -> e
     boolean $assertionsDisabled -> g
     int currentTime -> a
-    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:
+    1:1:void <clinit>():3568:3568 -> <clinit>
+    1:8:void <init>():3568:3575 -> <init>
+    9:9:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter$1):3568:3568 -> <init>
+    1:3:java.util.List computeSCC(com.android.tools.r8.ir.code.Value):3578:3580 -> a
+    1:33:void dfs(com.android.tools.r8.ir.code.Value):3584:3616 -> b
+com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.D.e.q:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap keyToTarget -> d
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> e
     com.android.tools.r8.ir.code.Value value -> c
-    1:1:void <init>(com.android.tools.r8.ir.code.Position):471:471 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.Position):467:467 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setValue(com.android.tools.r8.ir.code.Value):480:480 -> a
-    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):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
-    1:1:java.lang.Integer lambda$build$1(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):514:514 -> b
-com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.D.e.u:
+    1:1:void <init>(com.android.tools.r8.ir.code.Position):455:455 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.Position):451:451 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setValue(com.android.tools.r8.ir.code.Value):464:464 -> a
+    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder addKeyAndTarget(int,com.android.tools.r8.ir.code.BasicBlock):469:469 -> a
+    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):474:474 -> a
+    4:25:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):480:501 -> a
+    26:29:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createSwitchBlock(int,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.IRMetadata):1422:1425 -> a
+    26:29:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):501 -> a
+    30:31:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):502:503 -> a
+    32:32:java.lang.Integer lambda$build$0(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):492:492 -> a
+    1:1:java.lang.Integer lambda$build$1(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):498:498 -> b
+com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.D.e.t:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap histogramOfCanonicalizationCandidatesPerMethod -> e
     boolean $assertionsDisabled -> f
     int numberOfConstClassCanonicalization -> d
@@ -36020,7 +36130,7 @@
     178:178:com.android.tools.r8.ir.code.ConstInstruction com.android.tools.r8.ir.code.ConstInstruction.asConstInstruction():0:0 -> a
     178:178:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):165 -> a
     1:1:boolean lambda$canonicalize$3(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):161:161 -> b
-com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> com.android.tools.r8.D.e.t:
+com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> com.android.tools.r8.D.e.s:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():71:71 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.ConstantCanonicalizer):71:71 -> <init>
@@ -36032,7 +36142,7 @@
     7:10:int hashCode(java.lang.Object):71 -> a
     11:25:int hashCode(com.android.tools.r8.ir.code.ConstInstruction):74:88 -> a
     11:25:int hashCode(java.lang.Object):71 -> a
-com.android.tools.r8.ir.optimize.DeadCodeRemover -> com.android.tools.r8.D.e.v:
+com.android.tools.r8.ir.optimize.DeadCodeRemover -> com.android.tools.r8.D.e.u:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> b
     boolean $assertionsDisabled -> c
@@ -36059,7 +36169,7 @@
     5:39:java.util.Collection getDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):149:183 -> b
     5:39:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):121 -> b
     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.ir.optimize.DefaultInliningOracle -> com.android.tools.r8.D.e.v:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.IRCode code -> d
@@ -36069,89 +36179,119 @@
     com.android.tools.r8.graph.DexEncodedMethod method -> c
     com.android.tools.r8.ir.conversion.CallSiteInformation callSiteInformation -> e
     java.util.function.Predicate isProcessedConcurrently -> f
-    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>
+    1:1:void <clinit>():50:50 -> <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):69:77 -> <init>
     com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod) -> 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):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:
+    1:29:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):94:122 -> a
+    1:29:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):351 -> a
+    30:30:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):355:355 -> a
+    31:49:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):130:148 -> a
+    31:49:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
+    50:51:boolean isDoubleInliningTarget(com.android.tools.r8.graph.DexEncodedMethod):210:211 -> a
+    50:51:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):150 -> a
+    50:51:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
+    52:54:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):151:153 -> a
+    52:54:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
+    55:55:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    55:55:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):137 -> a
+    55:55:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
+    56:56:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    56:56:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):132 -> a
+    56:56:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
+    57:58:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):133:134 -> a
+    57:58:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
+    59:60:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):360:361 -> a
+    61:61:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):360:360 -> a
+    62:70:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):219:227 -> a
+    62:70:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365 -> a
+    71:71:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    71:71:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):227 -> a
+    71:71:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365 -> a
+    72:143:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):227:298 -> a
+    72:143:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365 -> a
+    144:146:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):297:299 -> a
+    144:146:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365 -> a
+    147:147:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):369:369 -> a
+    148:150:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):95:97 -> a
+    148:150:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):351 -> a
+    151:166:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):169:184 -> a
+    167:187:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):180:200 -> a
+    188:188:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
+    188:188:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):200 -> a
+    189:189:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):204:204 -> a
+    190:190:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
+    190:190:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):200 -> a
+    191:191:java.lang.Boolean lambda$canInlineStaticInvoke$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):182:182 -> a
+    192:192:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):311:311 -> a
+    193:204:int computeInstructionLimit(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):320:331 -> a
+    193:204:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):312 -> a
+    205:205:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):313:313 -> a
+    206:206:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):342:342 -> a
+    207:208:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):378:379 -> a
+    209:209:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    209:209:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):379 -> a
+    210:215:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):381:386 -> a
+    216:216:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
+    216:216:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):386 -> a
+    217:217:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):387:387 -> a
+    218:218:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    218:218:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):387 -> a
+    219:230:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):387:398 -> a
+    231:235:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):411:415 -> a
+    236:238:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):421:423 -> a
+    239:239:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    239:239:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):423 -> a
+    240:240:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):425:425 -> a
+    241:272:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):443:474 -> a
+    273:273:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    273:273:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):474 -> a
+    274:279:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):477:482 -> a
+    280:280:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    280:280:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):474 -> a
+    281:299:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):485:503 -> a
+    300:300:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    300:300:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):504 -> a
+    301:302:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):506:507 -> a
+    303:303:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    303:303:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):504 -> a
+    304:312:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):513:521 -> a
+    313:313:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    313:313:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):522 -> a
+    314:316:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):524:526 -> a
+    317:317:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    317:317:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):522 -> a
+    318:318:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):534:534 -> a
+    319:319:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):541:541 -> a
+    320:320:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():561:561 -> a
+    320:320:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):541 -> a
+    321:323:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):544:546 -> a
+    324:324:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():561:561 -> a
+    324:324:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):541 -> a
+    325:325:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):558:558 -> a
+    326:326:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():561:561 -> a
+    326:326:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):558 -> a
+    327:329:boolean willExceedInstructionBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):569:571 -> a
+    327:329:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):561 -> a
+    330:330:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):562:562 -> a
+    331:347:boolean willExceedControlFlowResolutionBlocksBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):656:672 -> a
+    331:347:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):563 -> a
+    348:348:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():561:561 -> a
+    348:348:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):558 -> a
+    349:365:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):591:607 -> a
+    366:366:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    366:366:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):607 -> a
+    367:371:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):608:612 -> a
+    372:372:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    372:372:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):613 -> a
+    373:373:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):615:615 -> a
+    374:374:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    374:374:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):607 -> a
+    375:378:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):620:623 -> a
+    379:379:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):682:682 -> a
+    380:404:void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):688:712 -> a
+    405:412:void insertAssumeInstructionsToInlinee(com.android.tools.r8.ir.optimize.Assumer,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator,java.util.Set):724:731 -> a
+com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.D.e.w:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():37:37 -> <clinit>
@@ -36167,7 +36307,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):959:959 -> a
+    125:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     125:125:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):174 -> a
     126:145:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):176:195 -> a
     146:146:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
@@ -36185,7 +36325,7 @@
     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:
+com.android.tools.r8.ir.optimize.DynamicTypeOptimization -> com.android.tools.r8.D.e.x:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():31:31 -> <clinit>
@@ -36213,7 +36353,7 @@
     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:
+com.android.tools.r8.ir.optimize.EnumInfoMapCollector -> com.android.tools.r8.D.e.y:
     java.util.Map valueInfoMaps -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):35:35 -> <init>
@@ -36222,26 +36362,25 @@
     2:44:void processClasses(com.android.tools.r8.graph.DexProgramClass):51:93 -> a
     2:44:com.android.tools.r8.shaking.AppInfoWithLiveness run():41 -> a
     45:48:com.android.tools.r8.shaking.AppInfoWithLiveness run():43:46 -> a
-com.android.tools.r8.ir.optimize.ForcedInliningOracle -> com.android.tools.r8.D.e.A:
+com.android.tools.r8.ir.optimize.ForcedInliningOracle -> com.android.tools.r8.D.e.z:
     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>
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):32:35 -> <init>
     boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback) -> a
     boolean isForcedInliningOracle() -> a
     void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason) -> a
     boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     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,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:
+    boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
+    1:5:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):45:49 -> a
+    6:16:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvoke(com.android.tools.r8.ir.code.InvokeMethod):62:72 -> a
+    6:16:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):58 -> a
+    17:20:com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod):113:116 -> a
+com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.D.e.B:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap histogramOfCanonicalizationCandidatesPerMethod -> e
@@ -36263,12 +36402,12 @@
     34:40:boolean isIdempotentLibraryMethodInvoke(com.android.tools.r8.ir.code.InvokeMethod):256:262 -> a
     34:40:void canonicalize(com.android.tools.r8.ir.code.IRCode):130 -> a
     41:61:void canonicalize(com.android.tools.r8.ir.code.IRCode):131:151 -> a
-    62:62:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    62:62:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     62:62:void canonicalize(com.android.tools.r8.ir.code.IRCode):151 -> a
     63:63:void canonicalize(com.android.tools.r8.ir.code.IRCode):152:152 -> a
     64:64:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
     64:64:void canonicalize(com.android.tools.r8.ir.code.IRCode):152 -> a
-    65:65:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    65:65:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     65:65:void canonicalize(com.android.tools.r8.ir.code.IRCode):151 -> a
     66:66:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
     66:66:void canonicalize(com.android.tools.r8.ir.code.IRCode):138 -> a
@@ -36308,7 +36447,7 @@
     210:210:void insertCanonicalizedInvokeWithInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):285 -> a
     211:211:boolean lambda$insertCanonicalizedInvokeWithInValues$6(com.android.tools.r8.ir.code.Instruction):280:280 -> a
     1:1:boolean lambda$canonicalize$3(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):195:195 -> b
-com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer$1 -> com.android.tools.r8.D.e.B:
+com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer$1 -> com.android.tools.r8.D.e.A:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():97:97 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer):97:97 -> <init>
@@ -36318,71 +36457,73 @@
     7:7:int hashCode(java.lang.Object):97:97 -> a
     8:8:int hashCode(com.android.tools.r8.ir.code.InvokeMethod):100:100 -> a
     8:8:int hashCode(java.lang.Object):97 -> a
-com.android.tools.r8.ir.optimize.Inliner -> com.android.tools.r8.D.e.J:
+com.android.tools.r8.ir.optimize.Inliner -> com.android.tools.r8.D.e.I:
     java.util.Set doubleInlineSelectedTargets -> g
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> c
     java.util.Set doubleInlineCallers -> f
     boolean applyDoubleInlining -> e
-    java.util.Set blackList -> b
+    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):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:
+    1:1:void <clinit>():69:69 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.ir.conversion.LensCodeRewriter):85:85 -> <init>
+    2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.ir.conversion.LensCodeRewriter):77:90 -> <init>
+    1:19:boolean isBlacklisted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):95:113 -> a
+    20:20:boolean isBlacklisted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):108:108 -> a
+    21:21:boolean isDoubleInliningEnabled():121:121 -> a
+    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):135:135 -> a
+    23:23:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    23:23:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1425 -> a
+    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):135 -> a
+    24:24:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1425:1425 -> a
+    24:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):135 -> a
+    25:30:boolean useReflectiveOperationExceptionOrUnknownClassInCatch(com.android.tools.r8.ir.code.IRCode):991:996 -> a
+    25:30:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):136 -> a
+    31:43:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):137:149 -> a
+    44:46:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):127:129 -> a
+    44:46:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):150 -> a
+    47:52:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):151:156 -> a
+    53:58:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):178:183 -> a
+    59:69:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):187:197 -> a
+    70:71:boolean isDoubleInliningTarget(com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.graph.DexEncodedMethod):202:203 -> a
+    72:79:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):238:245 -> a
+    80:93:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):244:257 -> a
+    94:98:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):247:251 -> a
+    99:105:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):247:253 -> a
+    106:130:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):773:797 -> a
+    131:132:void performForcedInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map):822:823 -> a
+    133:141:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):832:840 -> a
+    142:142:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):851:851 -> a
+    142:142:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):834 -> a
+    143:143:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):841:841 -> a
+    144:144:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):851:851 -> a
+    145:156:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):868:879 -> a
+    157:157:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    157:157:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):880 -> a
+    158:184:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):881:907 -> a
+    185:192:com.android.tools.r8.ir.code.Position getPositionForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):979:986 -> a
+    185:192:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):912 -> a
+    193:193:com.android.tools.r8.ir.code.Position getPositionForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):984:984 -> a
+    193:193:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):912 -> a
+    194:194:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):912:912 -> a
+    195:223:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):908:936 -> a
+    224:224:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    224:224:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):941 -> a
+    225:226:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):942:943 -> a
+    227:236:com.android.tools.r8.graph.DexType getDowncastTypeIfNeeded(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):1006:1015 -> a
+    227:236:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):949 -> a
+    237:266:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):943:972 -> a
+    267:267:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):475:475 -> a
+    267:267:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):973 -> a
+    268:269:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):974:975 -> a
+    1:7:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):162:168 -> b
+    8:8:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> b
+    8:8:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):168 -> b
+    9:20:void recordDoubleInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):220:231 -> b
+    1:7:boolean satisfiesRequirementsForDoubleInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):208:214 -> c
+com.android.tools.r8.ir.optimize.Inliner$Constraint -> com.android.tools.r8.D.e.C:
     com.android.tools.r8.ir.optimize.Inliner$Constraint PACKAGE -> e
     com.android.tools.r8.ir.optimize.Inliner$Constraint SAMENEST -> d
     com.android.tools.r8.ir.optimize.Inliner$Constraint[] $VALUES -> h
@@ -36392,62 +36533,107 @@
     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>():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:
+    1:17:void <clinit>():267:283 -> <clinit>
+    18:47:void <clinit>():267:296 -> <clinit>
+    1:2:void <init>(java.lang.String,int,int):287:288 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.Inliner$Constraint[] values():267:267 -> a
+    1:1:boolean isSet(int):300:300 -> b
+com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget -> com.android.tools.r8.D.e.D:
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget ALWAYS -> d
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget NEVER -> c
     com.android.tools.r8.ir.optimize.Inliner$Constraint constraint -> a
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType targetHolder -> b
-    1:9:void <clinit>():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
+    1:9:void <clinit>():318:326 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):328:331 -> <init>
+    5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):334:338 -> <init>
+    1:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):361:384 -> a
+    25:36:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):390:401 -> a
+    37:87:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):406:456 -> a
+    88:98:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):530:540 -> a
+    88:98:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):456 -> a
+    99:106:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):457:464 -> a
+    107:122:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):507:522 -> a
+    107:122:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):464 -> a
+    123:157:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):468:502 -> a
+    1:5:boolean equals(java.lang.Object):351:355 -> equals
+    1:4:int hashCode():343:346 -> hashCode
     5:5:int com.android.tools.r8.graph.DexType.computeHashCode():43:43 -> hashCode
-    5:5:int hashCode():335 -> hashCode
-com.android.tools.r8.ir.optimize.Inliner$InlineAction -> com.android.tools.r8.D.e.F:
+    5:5:int hashCode():346 -> hashCode
+com.android.tools.r8.ir.optimize.Inliner$InlineAction -> com.android.tools.r8.D.e.E:
     com.android.tools.r8.graph.DexEncodedMethod target -> a
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> b
     boolean shouldSynthesizeNullCheckForReceiver -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():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):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:
+    1:1:void <clinit>():565:565 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):573:576 -> <init>
+    1:1:void setShouldSynthesizeNullCheckForReceiver():580:580 -> a
+    2:17:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):589:604 -> a
+    18:18:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    18:18:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):604 -> a
+    19:50:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):605:636 -> a
+    51:51:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    51:51:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):637 -> a
+    52:62:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):638:648 -> a
+    63:63:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    63:63:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):647 -> a
+    64:85:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):650:671 -> a
+    86:91:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):670:675 -> a
+    92:92:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    92:92:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):677 -> a
+    93:93:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):677:677 -> a
+    94:94:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    94:94:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):675 -> a
+    95:103:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):678:686 -> a
+    104:104:com.android.tools.r8.ir.code.Phi com.android.tools.r8.ir.code.IRCode.createPhi(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1036:1036 -> a
+    104:104:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):688 -> a
+    105:106:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):689:690 -> a
+    107:107:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):130:130 -> a
+    107:107:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):692 -> a
+    108:110:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):696:698 -> a
+    111:111:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    111:111:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):698 -> a
+    112:124:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):699:711 -> a
+    125:125:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    125:125:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):711 -> a
+    126:139:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):712:725 -> a
+    140:140:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    140:140:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):724 -> a
+    141:141:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    141:141:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):723 -> a
+    142:142:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):726:726 -> a
+    143:143:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    143:143:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):726 -> a
+    144:148:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):728:732 -> a
+    149:149:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    149:149:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):732 -> a
+    150:150:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    150:150:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):733 -> a
+    151:151:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):734:734 -> a
+    152:152:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    152:152:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):734 -> a
+    153:165:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):735:747 -> a
+    166:166:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    166:166:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):747 -> a
+    167:171:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):752:756 -> a
+    172:172:com.android.tools.r8.ir.code.Value lambda$buildInliningIR$0(com.android.tools.r8.ir.code.BasicBlock):691:691 -> a
+com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason -> com.android.tools.r8.D.e.F:
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> a
     com.android.tools.r8.ir.code.IRCode code -> b
-    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner$Reason):632:634 -> <init>
-com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.D.e.H:
+    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner$Reason):765:767 -> <init>
+com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.D.e.G:
     com.android.tools.r8.graph.DexEncodedMethod target -> a
     com.android.tools.r8.graph.DexType receiverType -> b
-    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):678:680 -> <init>
-com.android.tools.r8.ir.optimize.Inliner$Reason -> com.android.tools.r8.D.e.I:
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):811:813 -> <init>
+com.android.tools.r8.ir.optimize.Inliner$Reason -> com.android.tools.r8.D.e.H:
     com.android.tools.r8.ir.optimize.Inliner$Reason SIMPLE -> e
     com.android.tools.r8.ir.optimize.Inliner$Reason SINGLE_CALLER -> c
     com.android.tools.r8.ir.optimize.Inliner$Reason DUAL_CALLER -> d
     com.android.tools.r8.ir.optimize.Inliner$Reason FORCE -> a
     com.android.tools.r8.ir.optimize.Inliner$Reason ALWAYS -> b
-    1:5:void <clinit>():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:
+    1:5:void <clinit>():553:557 -> <clinit>
+    1:1:void <init>(java.lang.String,int):552:552 -> <init>
+com.android.tools.r8.ir.optimize.InliningConstraints -> com.android.tools.r8.D.e.J:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.GraphLense graphLense -> c
     boolean allowStaticInterfaceMethodCalls -> b
@@ -36481,10 +36667,13 @@
     39:41:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):158:160 -> a
     42:42:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):159:159 -> a
     43:43:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):191:191 -> a
-    44:60:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):286:302 -> a
-    61:74:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):300:313 -> a
-    75:98:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):318:341 -> a
-    99:148:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):348:397 -> a
+    44:60:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):285:301 -> a
+    61:74:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):299:312 -> a
+    75:98:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):317:340 -> a
+    99:140:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):347:388 -> a
+    141:141:java.util.Set com.android.tools.r8.graph.ResolutionResult.lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):33:33 -> a
+    141:141:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):388 -> a
+    142:149:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):389:396 -> a
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):88:88 -> b
     2:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstancePut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):126:128 -> b
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstancePut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):127:127 -> b
@@ -36492,29 +36681,28 @@
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):122:122 -> c
     2:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):184:186 -> c
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):185:185 -> c
-    6:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):248:250 -> c
-    9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):249:249 -> c
+    6:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):247:249 -> c
+    9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):248:248 -> c
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeMultiNewArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):172:172 -> d
     2:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):195:196 -> d
-    4:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticPut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):254:256 -> d
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticPut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):255:255 -> d
+    4:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticPut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):253:255 -> d
+    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticPut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):254:254 -> d
     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.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
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayEmpty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):223:223 -> f
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):231:231 -> g
+com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.D.e.K:
+    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     boolean isForcedInliningOracle() -> a
     com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType) -> a
-com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.D.e.M:
+com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.D.e.L:
     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
     void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason) -> a
     boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     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,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
-com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.D.e.N:
+    boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
+com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.D.e.M:
     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
@@ -36522,7 +36710,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.O:
+com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool -> com.android.tools.r8.D.e.N:
     java.util.Set interfaces -> c
     java.util.Set subTypes -> d
     java.util.Set memberPool -> e
@@ -36551,7 +36739,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.S:
+com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.D.e.Q:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set warnedFields -> c
@@ -36586,66 +36774,69 @@
     99:99:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):235 -> a
     100:100:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):237:237 -> a
     101:108:void rewriteStaticGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet):341:348 -> a
-    109:141:void rewriteStaticGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet):347:379 -> a
-    142:142:java.lang.Boolean lambda$rewriteStaticGetWithConstantValues$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):348:348 -> a
-    143:153:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):418:428 -> a
-    154:154:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    154:154:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):429 -> a
-    155:157:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):430:432 -> a
-    158:207:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):250:299 -> a
-    158:207:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    208:212:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedMethod):98:102 -> a
-    208:212:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):303 -> a
-    208:212:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    213:219:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):306:312 -> a
-    213:219:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    220:227:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):311:318 -> a
-    220:227:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    228:232:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):190:194 -> a
-    228:232:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):317 -> a
-    228:232:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    233:236:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):192:195 -> a
-    233:236:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):317 -> a
-    233:236:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    237:246:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):191:200 -> a
-    237:246:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):317 -> a
-    237:246:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    247:253:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):321:327 -> a
-    247:253:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    254:254:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    254:254:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):327 -> a
-    254:254:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    255:255:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    255:255:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):329 -> a
-    255:255:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    256:256:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):331:331 -> a
-    256:256:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    257:263:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):433:439 -> a
-    264:272:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):434:442 -> a
-    273:273: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:388 -> a
-    273:273:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):441 -> a
-    274:274:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    274:274: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 -> a
-    274:274:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):441 -> a
-    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):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.P:
+    109:144:void rewriteStaticGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet):347:382 -> a
+    145:145:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    145:145:void rewriteStaticGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet):382 -> a
+    146:154:void rewriteStaticGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet):384:392 -> a
+    155:155:java.lang.Boolean lambda$rewriteStaticGetWithConstantValues$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):348:348 -> a
+    156:166:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):432:442 -> a
+    167:167:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    167:167:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):443 -> a
+    168:170:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):444:446 -> a
+    171:220:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):250:299 -> a
+    171:220:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    221:225:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedMethod):98:102 -> a
+    221:225:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):303 -> a
+    221:225:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    226:232:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):306:312 -> a
+    226:232:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    233:240:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):311:318 -> a
+    233:240:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    241:245:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):190:194 -> a
+    241:245:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):317 -> a
+    241:245:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    246:249:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):192:195 -> a
+    246:249:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):317 -> a
+    246:249:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    250:259:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):191:200 -> a
+    250:259:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):317 -> a
+    250:259:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    260:266:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):321:327 -> a
+    260:266:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    267:267:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    267:267:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):327 -> a
+    267:267:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    268:268:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    268:268:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):329 -> a
+    268:268:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    269:269:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):331:331 -> a
+    269:269:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    270:276:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):447:453 -> a
+    277:285:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):448:456 -> a
+    286:286:void rewriteInstanceGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet):401:401 -> a
+    286:286:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):455 -> a
+    287:287:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
+    287:287:void rewriteInstanceGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet):401 -> a
+    287:287:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):455 -> a
+    288:305:void rewriteInstanceGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet):405:422 -> a
+    288:305:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):455 -> a
+    306:307:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):460:461 -> a
+    308:308:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    308:308:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):461 -> a
+    309:311:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):461:463 -> a
+com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup -> com.android.tools.r8.D.e.O:
     com.android.tools.r8.shaking.ProguardMemberRule rule -> b
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType type -> a
     1:3:void <init>(com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType,com.android.tools.r8.shaking.ProguardMemberRule):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.Q:
+com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType -> com.android.tools.r8.D.e.P:
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType ASSUME_VALUES -> c
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType NONE -> a
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType ASSUME_NO_SIDE_EFFECTS -> b
     1:3:void <clinit>():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.T:
+com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.D.e.S:
     java.util.Map com.android.tools.r8.ir.optimize.MemberPoolCollection.memberPools -> c
     com.android.tools.r8.graph.AppView com.android.tools.r8.ir.optimize.MemberPoolCollection.appView -> b
     com.android.tools.r8.com.google.common.base.Equivalence com.android.tools.r8.ir.optimize.MemberPoolCollection.equivalence -> a
@@ -36675,16 +36866,16 @@
     12:13:void com.android.tools.r8.ir.optimize.MemberPoolCollection.submitAll(java.lang.Iterable,java.util.List,java.util.concurrent.ExecutorService):98:99 -> a
     14:14:void com.android.tools.r8.ir.optimize.MemberPoolCollection.submit(com.android.tools.r8.graph.DexClass,java.util.List,java.util.concurrent.ExecutorService):104:104 -> a
     15:18:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):135:138 -> a
-    19:19:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):558:558 -> a
+    19:19:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> a
     19:19:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):139 -> a
     20:21:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):141:142 -> a
-    22:22:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):582:582 -> a
+    22:22:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):581:581 -> a
     22:22:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):143 -> a
     23:30:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):145:152 -> a
-    31:31:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):558:558 -> a
+    31:31:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> a
     31:31:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):153 -> a
     32:33:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):155:156 -> a
-    34:34:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):582:582 -> a
+    34:34:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):581:581 -> a
     34:34:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):157 -> a
     35:35:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$1(java.util.Deque,com.android.tools.r8.graph.DexType):140:140 -> a
     36:36:void com.android.tools.r8.ir.optimize.MemberPoolCollection.addNonNull(java.util.Collection,java.lang.Object):234:234 -> a
@@ -36720,7 +36911,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.U:
+com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.D.e.T:
     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>
@@ -36728,7 +36919,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.V:
+com.android.tools.r8.ir.optimize.NestReducer -> com.android.tools.r8.D.e.U:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():29:29 -> <clinit>
@@ -36762,75 +36953,71 @@
     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.W:
+com.android.tools.r8.ir.optimize.NestUtils -> com.android.tools.r8.D.e.V:
     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():879:879 -> a
+    15:15:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     15:15:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):46 -> a
     16:31:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):47:62 -> a
     32:36:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):61:65 -> a
     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.X:
+com.android.tools.r8.ir.optimize.NonNullTracker -> com.android.tools.r8.D.e.W:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.function.Consumer splitBlockConsumer -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():51:51 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):58:58 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Consumer):61:64 -> <init>
+    1:1:void <clinit>():47:47 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):54:54 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Consumer):57:60 -> <init>
     void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode) -> a
     boolean lambda$addNonNullForValues$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
-    1:15:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):70:84 -> a
+    1:15:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):66:80 -> a
     16:16:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    16:16:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):85 -> a
-    17:73:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):86:142 -> a
+    16:16:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):81 -> a
+    17:73:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):82:138 -> a
     74:74:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
-    74:74:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):142 -> a
-    75:78:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):143:146 -> a
-    79:87:boolean verifyCompanionClassInstanceIsKnownToBeNonNull(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,java.util.Set):257:265 -> a
-    79:87:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):146 -> a
+    74:74:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):138 -> a
+    75:78:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):139:142 -> a
+    79:87:boolean verifyCompanionClassInstanceIsKnownToBeNonNull(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,java.util.Set):253:261 -> a
+    79:87:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):142 -> a
     88:88:boolean com.android.tools.r8.graph.DexClass.initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView):784:784 -> a
-    88:88:boolean verifyCompanionClassInstanceIsKnownToBeNonNull(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,java.util.Set):266 -> a
-    88:88:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):146 -> a
-    89:97:boolean verifyCompanionClassInstanceIsKnownToBeNonNull(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,java.util.Set):267:275 -> a
-    89:97:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):146 -> a
+    88:88:boolean verifyCompanionClassInstanceIsKnownToBeNonNull(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,java.util.Set):262 -> a
+    88:88:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):142 -> a
+    89:97:boolean verifyCompanionClassInstanceIsKnownToBeNonNull(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,java.util.Set):263:271 -> a
+    89:97:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):142 -> a
     98:98:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    98:98:boolean verifyCompanionClassInstanceIsKnownToBeNonNull(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,java.util.Set):261 -> a
-    98:98:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):146 -> a
-    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:184:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):229:237 -> a
+    98:98:boolean verifyCompanionClassInstanceIsKnownToBeNonNull(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,java.util.Set):257 -> a
+    98:98:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):142 -> a
+    99:100:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):153:154 -> a
+    101:175:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):153:227 -> a
+    176:184:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):225:233 -> a
     185:185:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    185:185:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):237 -> a
-    186:186:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):237:237 -> a
+    185:185:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):233 -> a
+    186:186:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):233:233 -> a
     187:187:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
-    187:187:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):238 -> a
+    187:187:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):234 -> a
     188:188:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):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
+    188:188:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):235 -> a
+    189:198:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):236:245 -> a
     199:199:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    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
-    262:272:void addNonNullForValues(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.util.Set,java.util.Set):361:371 -> a
+    199:199:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):245 -> a
+    200:200:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):245:245 -> a
+    201:261:void addNonNullForValues(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.util.Set,java.util.Set):299:359 -> a
+    262:272:void addNonNullForValues(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.util.Set,java.util.Set):357:367 -> a
     273:273:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    273:273:void addNonNullForValues(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.util.Set,java.util.Set):371 -> a
-    274:279:void addNonNullForValues(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.util.Set,java.util.Set):374:379 -> a
-    280:285:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):387:392 -> a
+    273:273:void addNonNullForValues(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.util.Set,java.util.Set):367 -> a
+    274:279:void addNonNullForValues(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.util.Set,java.util.Set):370:375 -> a
+    280:285:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):383:388 -> a
     286:286:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
-    286:286:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):392 -> a
-    287:295:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):394:402 -> a
-    296:298:boolean isNullableReferenceTypeWithUsers(com.android.tools.r8.ir.code.Value):411:413 -> a
+    286:286:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):388 -> a
+    287:295:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):390:398 -> a
+    296:298:boolean isNullableReferenceTypeWithUsers(com.android.tools.r8.ir.code.Value):407:409 -> a
     299:299:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    299:299:boolean isNullableReferenceTypeWithUsers(com.android.tools.r8.ir.code.Value):413 -> a
-    300:300:boolean isNullableReferenceTypeWithUsers(com.android.tools.r8.ir.code.Value):414:414 -> a
-    301:332:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):418:449 -> a
-    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.k0:
+    299:299:boolean isNullableReferenceTypeWithUsers(com.android.tools.r8.ir.code.Value):409 -> a
+    300:300:boolean isNullableReferenceTypeWithUsers(com.android.tools.r8.ir.code.Value):410:410 -> a
+com.android.tools.r8.ir.optimize.Outliner -> com.android.tools.r8.D.e.j0:
     java.util.List candidateMethodLists -> a
     java.util.Map outlineSites -> c
     java.util.Map generatedOutlines -> d
@@ -36849,10 +37036,10 @@
     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:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     31:31:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1343 -> a
     32:40:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1344:1352 -> a
-    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     41:41:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1352 -> a
     42:64:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1353:1375 -> a
     65:65:void com.android.tools.r8.graph.DexProgramClass.<init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):70:70 -> a
@@ -36871,7 +37058,7 @@
     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.Y:
+com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction -> com.android.tools.r8.D.e.X:
     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
@@ -36899,7 +37086,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.Z:
+com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction -> com.android.tools.r8.D.e.Y:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> d
     com.android.tools.r8.graph.DexProto proto -> f
     boolean hasOutValue -> e
@@ -36935,7 +37122,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.a0:
+com.android.tools.r8.ir.optimize.Outliner$NewInstanceOutlineInstruction -> com.android.tools.r8.D.e.Z:
     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
@@ -36956,7 +37143,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.b0:
+com.android.tools.r8.ir.optimize.Outliner$Outline -> com.android.tools.r8.D.e.a0:
     java.util.List argumentMap -> b
     java.util.List argumentTypes -> a
     com.android.tools.r8.graph.DexProto proto -> e
@@ -36980,7 +37167,7 @@
     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$OutlineCode -> com.android.tools.r8.D.e.b0:
     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>
@@ -36995,7 +37182,7 @@
     int estimatedSizeForInlining() -> l
     boolean isOutlineCode() -> o
     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 -> com.android.tools.r8.D.e.d0:
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():122:122 -> <clinit>
@@ -37007,7 +37194,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.d0:
+com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType -> com.android.tools.r8.D.e.c0:
     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
@@ -37020,13 +37207,13 @@
     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.f0:
+com.android.tools.r8.ir.optimize.Outliner$OutlineMethodIdentifier -> com.android.tools.r8.D.e.e0:
     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):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:
+com.android.tools.r8.ir.optimize.Outliner$OutlineRewriter -> com.android.tools.r8.D.e.f0:
     java.util.ListIterator blocksIterator -> r
     java.util.List toRemove -> s
     com.android.tools.r8.ir.code.IRCode code -> q
@@ -37035,17 +37222,19 @@
     int argumentsMapIndex -> t
     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):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:
+    1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1200:1202 -> a
+    4:6:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1266:1268 -> a
+    4:6:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1202 -> a
+    7:56:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1203:1252 -> a
+    57:57:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    57:57:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1252 -> a
+    58:64:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1253:1259 -> a
+com.android.tools.r8.ir.optimize.Outliner$OutlineSiteIdentifier -> com.android.tools.r8.D.e.g0:
     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):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$OutlineSourceCode -> com.android.tools.r8.D.e.h0:
     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
@@ -37079,7 +37268,7 @@
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> e
     boolean verifyRegister(int) -> f
     int instructionIndex(int) -> g
-com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter -> com.android.tools.r8.D.e.j0:
+com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter -> com.android.tools.r8.D.e.i0:
     int pendingNewInstanceIndex -> n
     com.android.tools.r8.graph.DexType returnType -> k
     boolean $assertionsDisabled -> p
@@ -37104,7 +37293,7 @@
     5:10:java.util.List orderedInValues(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):767:772 -> a
     11:23:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):918:930 -> a
     24:30:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):935:941 -> a
-    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     31:31:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):941 -> a
     32:38:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):945:951 -> a
     39:71:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):957:989 -> a
@@ -37123,14 +37312,14 @@
     105:113:void includeInstruction(com.android.tools.r8.ir.code.Instruction):997:1005 -> c
     105:113:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     105:113:void process():760 -> c
-    114:114:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> c
+    114:114:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> c
     114:114:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1006 -> c
     114:114:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     114:114:void process():760 -> c
     115:121:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1006:1012 -> c
     115:121:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     115:121:void process():760 -> c
-    122:122:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> c
+    122:122:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> c
     122:122:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1006 -> c
     122:122:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     122:122:void process():760 -> c
@@ -37140,7 +37329,7 @@
     132:137:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1023:1028 -> c
     132:137:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     132:137:void process():760 -> c
-    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> c
+    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> c
     138:138:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1028 -> c
     138:138:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     138:138:void process():760 -> c
@@ -37153,7 +37342,7 @@
     164:172:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1034:1042 -> c
     164:172:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     164:172:void process():760 -> c
-    173:173:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> c
+    173:173:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> c
     173:173:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1028 -> c
     173:173:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     173:173:void process():760 -> c
@@ -37168,7 +37357,7 @@
     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:
+com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.D.e.k0:
     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
@@ -37204,7 +37393,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():1478:1478 -> a
+    315:315:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
     315:315:com.android.tools.r8.ir.code.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
@@ -37216,20 +37405,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():1478:1478 -> a
+    390:390:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
     390:390:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):454 -> a
-    391:391:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> a
+    391:391:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
     391:391:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):454 -> a
     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():1478:1478 -> a
+    408:408:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> 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.m0:
+com.android.tools.r8.ir.optimize.PhiOptimizations -> com.android.tools.r8.D.e.l0:
     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
@@ -37251,7 +37440,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.p0:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination -> com.android.tools.r8.D.e.o0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.code.DominatorTree dominatorTree -> d
     boolean $assertionsDisabled -> j
@@ -37271,16 +37460,16 @@
     24:24:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     24:24:void run():125 -> a
     25:39:void run():126:140 -> a
-    40:40:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    40:40:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     40:40:void run():140 -> a
     41:46:void run():141:146 -> a
-    47:47:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    47:47:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     47:47:void run():140 -> a
     48:54:void run():148:154 -> a
-    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     55:55:void run():154 -> a
     56:57:void run():155:156 -> a
-    58:58:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    58:58:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     58:58:void run():154 -> a
     59:127:void run():157:225 -> a
     128:154:void run():200:226 -> a
@@ -37290,14 +37479,14 @@
     164:166:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):297:299 -> a
     164:166:void propagateActiveFieldsFrom(com.android.tools.r8.ir.code.BasicBlock):245 -> a
     164:166:void run():229 -> a
-    167:167:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    167:167:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     167:167:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):299 -> a
     167:167:void propagateActiveFieldsFrom(com.android.tools.r8.ir.code.BasicBlock):245 -> a
     167:167:void run():229 -> a
     168:169:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):300:301 -> a
     168:169:void propagateActiveFieldsFrom(com.android.tools.r8.ir.code.BasicBlock):245 -> a
     168:169:void run():229 -> a
-    170:170:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    170:170:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     170:170:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):299 -> a
     170:170:void propagateActiveFieldsFrom(com.android.tools.r8.ir.code.BasicBlock):245 -> a
     170:170:void run():229 -> a
@@ -37314,8 +37503,8 @@
     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.n0:
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject -> com.android.tools.r8.D.e.o0:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1 -> com.android.tools.r8.D.e.m0:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject -> com.android.tools.r8.D.e.n0:
     com.android.tools.r8.graph.DexField field -> a
     com.android.tools.r8.ir.code.Value object -> b
     boolean $assertionsDisabled -> c
@@ -37325,7 +37514,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.q0:
+com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.D.e.p0:
     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
@@ -37342,17 +37531,17 @@
     59:61:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):55:57 -> a
     62:69:com.android.tools.r8.graph.DexType getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeStatic):133:140 -> a
     62:69:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
-    70:70:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    70:70:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     70:70:com.android.tools.r8.graph.DexType getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeStatic):140 -> a
     70:70:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
     71:96:com.android.tools.r8.graph.DexType getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeStatic):142:167 -> a
     71:96:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
-    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     97:97:com.android.tools.r8.graph.DexType getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeStatic):170 -> a
     97:97:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
     98:124:com.android.tools.r8.graph.DexType getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeStatic):172:198 -> a
     98:124:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
-    125:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    125:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     125:125:com.android.tools.r8.graph.DexType getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeStatic):140 -> a
     125:125:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
     126:128:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):60:62 -> a
@@ -37367,7 +37556,7 @@
     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.s0:
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.D.e.r0:
     com.android.tools.r8.graph.AppView appView -> c
     java.util.concurrent.ConcurrentHashMap synthesizedServiceLoaders -> b
     com.android.tools.r8.graph.DexProgramClass synthesizedClass -> a
@@ -37375,29 +37564,29 @@
     2:8:void <init>(com.android.tools.r8.graph.AppView):71:77 -> <init>
     1:1:com.android.tools.r8.graph.DexProgramClass getSynthesizedClass():81:81 -> a
     2:2:void rewrite(com.android.tools.r8.ir.code.IRCode):85:85 -> a
-    3:3:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    3:3:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     3:3:void rewrite(com.android.tools.r8.ir.code.IRCode):86 -> a
     4:29:void rewrite(com.android.tools.r8.ir.code.IRCode):87:112 -> a
-    30:30:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    30:30:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     30:30:void rewrite(com.android.tools.r8.ir.code.IRCode):112 -> a
     31:56:void rewrite(com.android.tools.r8.ir.code.IRCode):113:138 -> a
-    57:57:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    57:57:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     57:57:void rewrite(com.android.tools.r8.ir.code.IRCode):138 -> a
     58:60:void rewrite(com.android.tools.r8.ir.code.IRCode):138:140 -> a
-    61:61:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    61:61:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     61:61:void rewrite(com.android.tools.r8.ir.code.IRCode):141 -> a
     62:65:void rewrite(com.android.tools.r8.ir.code.IRCode):142:145 -> a
-    66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     66:66:void rewrite(com.android.tools.r8.ir.code.IRCode):141 -> a
-    67:67:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    67:67:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     67:67:void rewrite(com.android.tools.r8.ir.code.IRCode):138 -> a
     68:87:void rewrite(com.android.tools.r8.ir.code.IRCode):150:169 -> a
     88:99:void rewrite(com.android.tools.r8.ir.code.IRCode):168:179 -> a
-    100:100:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    100:100:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     100:100:void rewrite(com.android.tools.r8.ir.code.IRCode):112 -> a
     101:102:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):184:185 -> a
     101:102:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
-    103:103:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    103:103:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     103:103:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):185 -> a
     103:103:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
     104:124:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):186:206 -> a
@@ -37410,7 +37599,7 @@
     126:126:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
     127:137:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):206:216 -> a
     127:137:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
-    138:138:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1333:1333 -> a
+    138:138:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> a
     138:138:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):213 -> a
     138:138:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
     139:146:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):218:225 -> a
@@ -37442,10 +37631,10 @@
     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:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     254:254:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):172 -> a
     255:255:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):173:173 -> a
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.D.e.r0:
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.D.e.q0:
     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
@@ -37455,7 +37644,7 @@
     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.optimize.SwitchCaseEliminator -> com.android.tools.r8.D.e.s0:
     com.android.tools.r8.ir.code.IntSwitch theSwitch -> d
     com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
     boolean mayHaveIntroducedUnreachableBlocks -> e
@@ -37493,7 +37682,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.u0:
+com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.D.e.t0:
     com.android.tools.r8.graph.DexString switchMapPrefix -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexString kotlinSwitchMapPrefix -> c
@@ -37505,15 +37694,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():875:875 -> a
+    19:19:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
     19:19:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):105 -> a
     20:56:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):107:143 -> a
-    57:57:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
+    57:57:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
     57:57:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):105 -> a
     58:58:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):107:107 -> a
     59:61:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):148:150 -> a
-com.android.tools.r8.ir.optimize.SwitchUtils$1 -> com.android.tools.r8.D.e.v0:
-com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo -> com.android.tools.r8.D.e.w0:
+com.android.tools.r8.ir.optimize.SwitchUtils$1 -> com.android.tools.r8.D.e.u0:
+com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo -> com.android.tools.r8.D.e.v0:
     com.android.tools.r8.ir.code.Instruction arrayGet -> b
     com.android.tools.r8.ir.code.Instruction staticGet -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap indexMap -> d
@@ -37521,7 +37710,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.z0:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization -> com.android.tools.r8.D.e.y0:
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> h
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> i
@@ -37577,7 +37766,7 @@
     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
+    323:323:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):475:475 -> a
     323:323:void rewrite(com.android.tools.r8.ir.code.IRCode):428 -> a
     324:326:void rewrite(com.android.tools.r8.ir.code.IRCode):429:431 -> a
     327:331:void logResults():458:462 -> a
@@ -37597,19 +37786,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.x0:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy -> com.android.tools.r8.D.e.w0:
     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.y0:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLense -> com.android.tools.r8.D.e.x0:
     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.F0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector -> com.android.tools.r8.D.e.E0:
     com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map removedArguments -> d
@@ -37623,42 +37812,47 @@
     2:2:com.android.tools.r8.utils.MethodSignatureEquivalence access$100():45:45 -> a
     3:9:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):98:104 -> a
     10:36:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):98:124 -> a
-    37:37:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217:217 -> a
-    38:57:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):280:299 -> a
-    58:58:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    58:58:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):299 -> a
-    59:70:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):300:311 -> a
-    71:71:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo.builder():119:119 -> a
-    71:71:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):313 -> a
-    72:74:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):314:316 -> a
-    75:82:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):312:319 -> a
-    83:86:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):326:329 -> a
-    87:87:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    87:87:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):329 -> a
-    88:96:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):329:337 -> a
-    97:97:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    97:97:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):337 -> a
-    98:104:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):338:344 -> a
-    1:1:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):221:221 -> b
-    2:2:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> b
-    2:2:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):222 -> b
-    3:9:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):222:228 -> b
-    10:10:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod):275:275 -> b
-    10:10:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):229 -> b
-    11:23:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):230:242 -> b
-    24:24:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> b
-    24:24:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):222 -> b
-    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.A0:
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> com.android.tools.r8.D.e.B0:
+    37:37:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):221:221 -> a
+    37:37:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    38:38:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    38:38:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):222 -> a
+    38:38:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    39:45:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):222:228 -> a
+    39:45:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    46:46:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod):275:275 -> a
+    46:46:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):229 -> a
+    46:46:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    47:59:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):230:242 -> a
+    47:59:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    60:60:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    60:60:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):222 -> a
+    60:60:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    61:80:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):280:299 -> a
+    81:81:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
+    81:81:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):299 -> a
+    82:93:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):300:311 -> a
+    94:94:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo.builder():119:119 -> a
+    94:94:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):313 -> a
+    95:97:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):314:316 -> a
+    98:105:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):312:319 -> a
+    106:109:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):326:329 -> a
+    110:110:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
+    110:110:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):329 -> a
+    111:119:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):329:337 -> a
+    120:120:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
+    120:120:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):337 -> a
+    121:127:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):338:344 -> a
+    1:18:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):248:265 -> b
+    19:24:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):264:269 -> b
+    1:1:java.lang.Runnable runnableForClass(com.android.tools.r8.graph.DexProgramClass):217:217 -> c
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1 -> com.android.tools.r8.D.e.z0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> com.android.tools.r8.D.e.A0:
     java.util.BitSet used -> a
     1:3:void <init>():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.C0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$GloballyUsedSignatures -> com.android.tools.r8.D.e.B0:
     com.android.tools.r8.ir.optimize.UnusedArgumentsCollector this$0 -> b
     com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool methodPool -> a
     1:2:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):183:184 -> <init>
@@ -37668,11 +37862,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.D0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UnusedArgumentsGraphLense -> com.android.tools.r8.D.e.C0:
     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.E0:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures -> com.android.tools.r8.D.e.D0:
     com.android.tools.r8.ir.optimize.UnusedArgumentsCollector this$0 -> c
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> a
     java.util.Set usedSignatures -> b
@@ -37696,7 +37890,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.G0.b:
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.D.e.F0.b:
     java.util.concurrent.ConcurrentHashMap knownClasses -> b
     com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> a
     boolean $assertionsDisabled -> c
@@ -37722,19 +37916,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():875:875 -> a
+    34:34:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
     34:34:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):172 -> a
     35:81:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):172:218 -> a
     82:84:void logIneligibleUser(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionOrPhi):77:79 -> a
     82:84:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):218 -> a
     85:94:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):223:232 -> a
-    95:95:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1017:1017 -> a
+    95:95:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1089:1089 -> a
     95:95:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):233 -> a
     96:97:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):234:235 -> a
     98:98:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     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.G0.a:
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus -> com.android.tools.r8.D.e.F0.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
@@ -37752,7 +37946,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.G0.c:
+com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.tools.r8.D.e.F0.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
@@ -37772,21 +37966,21 @@
     29:45:com.android.tools.r8.ir.code.Value getOrCreateInValue(com.android.tools.r8.ir.code.BasicBlock):101:117 -> a
     1:13:com.android.tools.r8.ir.code.Value getOrCreateOutValue(com.android.tools.r8.ir.code.BasicBlock):69:81 -> b
     14:24:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):123:133 -> b
-    25:25:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    25:25:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     25:25:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):133 -> b
     26:26:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):133:133 -> b
-    27:27:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    27:27:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     27:27:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):133 -> b
     28:38:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):142:152 -> b
     39:39:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> b
     39:39:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):152 -> b
-    40:40:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> b
+    40:40:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> b
     40:40:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):151 -> b
     41:45:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):151:155 -> b
     46:46:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):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.G0.d:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.D.e.F0.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
@@ -37808,53 +38002,53 @@
     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):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):582 -> a
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    2:2:boolean lambda$isEligibleConstructorCall$1(com.android.tools.r8.ir.code.Value):589 -> a
+    3:3:boolean lambda$isEligibleConstructorCall$1(com.android.tools.r8.ir.code.Value):589:589 -> a
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    4:4:boolean lambda$isEligibleConstructorCall$1(com.android.tools.r8.ir.code.Value):589 -> a
     5:34:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):262:291 -> a
-    35:47:com.android.tools.r8.graph.DexEncodedMethod findSingleTarget(com.android.tools.r8.ir.code.InvokeMethod):955:967 -> a
+    35:47:com.android.tools.r8.graph.DexEncodedMethod findSingleTarget(com.android.tools.r8.ir.code.InvokeMethod):962:974 -> 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:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):800:807 -> a
     86:93:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    94:94:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> 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.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    94:94:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):807 -> a
     94:94:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    95:102:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):800:807 -> a
+    95:102:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):807:814 -> a
     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):807 -> a
+    103:103:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):814 -> a
     103:103:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    104:104:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> 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.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    104:104:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):807 -> a
     104:104:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    105:105:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):812:812 -> a
+    105:105:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):819:819 -> a
     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:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):847:848 -> a
+    106:107:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):822 -> a
     106:107:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    108:108:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():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):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.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    108:108:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):848 -> a
+    108:108:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):822 -> a
     108:108:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    109:116:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):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:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):849:856 -> a
+    109:116:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):822 -> a
     109:116:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    117:117:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():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):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.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    117:117:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):848 -> a
+    117:117:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):822 -> a
     117:117:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    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:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):826:837 -> 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:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     138:138:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370 -> a
     139:139:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370:370 -> a
-    140:140:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    140:140:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     140:140:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370 -> a
     141:147:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):409:415 -> a
     141:147:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):371 -> a
@@ -37869,82 +38063,82 @@
     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):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):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):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
+    186:238:void removeMiscUsages(com.android.tools.r8.ir.code.IRCode):460:512 -> a
+    186:238:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):401 -> a
+    239:255:void removeFieldReads(com.android.tools.r8.ir.code.IRCode):518:534 -> a
+    239:255:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):402 -> a
+    256:271:void removeFieldWrites():563:578 -> a
+    256:271:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):403 -> a
+    272:274:void removeFieldWrites():572:574 -> a
+    272:274:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):403 -> a
+    275:277:void removeFieldWrites():565:567 -> a
+    275:277:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):403 -> a
+    278:278:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):404:404 -> a
+    279:283:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):542:546 -> a
+    284:295:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):545:556 -> 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 replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):556 -> a
+    297:297:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):557:557 -> a
+    298:298:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    298:298:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):557 -> a
+    299:302:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):556:559 -> a
+    303:303:com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper lambda$replaceFieldRead$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):546:546 -> a
+    304:309: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):584:589 -> a
+    310:362: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):588:640 -> a
+    363:393:boolean isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):655:685 -> a
+    363:393:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):703 -> a
+    394: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):694:696 -> a
+    397:403: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):695:701 -> a
+    404:404: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):699:699 -> a
+    405:407:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod):707:709 -> a
+    408:408:boolean lambda$isEligibleIndirectVirtualMethodCall$4(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):710:710 -> a
+    409:445:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleVirtualMethodCall(boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):720:756 -> a
+    446:451:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):760:765 -> a
+    452:452:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    452:452:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):765 -> a
+    453:453:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):765:765 -> a
+    454:454:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    454:454:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):765 -> a
+    455:458:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):769:772 -> a
+    459:489:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):869:899 -> a
+    490:495:boolean isTrivialInitializer(com.android.tools.r8.graph.DexMethod):930:935 -> a
+    490:495:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):900 -> a
+    496:522:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):895:921 -> a
+    523:523:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):917:917 -> a
+    524:537:boolean isEligibleSingleTarget(com.android.tools.r8.graph.DexEncodedMethod):981:994 -> a
+    538:538:boolean isEligibleSingleTarget(com.android.tools.r8.graph.DexEncodedMethod):993:993 -> a
+    539:539:void lambda$removeInstruction$5(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1008:1008 -> a
+    540:541:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1008:1009 -> a
     1:103:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassAndUsageEligible():148:250 -> b
     104:104:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassAndUsageEligible():234:234 -> b
-    105:105:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> 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):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
+    105:105:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    105:105:boolean lambda$isEligibleDirectVirtualMethodCall$2(com.android.tools.r8.ir.code.Value):696 -> b
+    106:106:boolean lambda$isEligibleDirectVirtualMethodCall$2(com.android.tools.r8.ir.code.Value):696:696 -> b
+    107:107:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    107:107:boolean lambda$isEligibleDirectVirtualMethodCall$2(com.android.tools.r8.ir.code.Value):696 -> b
+    108:121:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):939:952 -> b
+    108:121:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):956 -> b
     122:122:boolean com.android.tools.r8.kotlin.KotlinSyntheticClass.isLambda():48:48 -> b
-    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
+    122:122:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):952 -> b
+    122:122:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):956 -> b
+    123:123:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):957:957 -> 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:
+com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo -> com.android.tools.r8.D.e.G0.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.H0.b:
+com.android.tools.r8.ir.optimize.info.DefaultCallSiteOptimizationInfo -> com.android.tools.r8.D.e.G0.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.H0.c:
+com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo -> com.android.tools.r8.D.e.G0.c:
     com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -37955,7 +38149,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.H0.d:
+com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo -> com.android.tools.r8.D.e.G0.d:
     boolean UNKNOWN_TRIGGERS_CLASS_INIT_BEFORE_ANY_SIDE_EFFECT -> m
     boolean UNKNOWN_INITIALIZER_ENABLING_JAVA_ASSERTIONS -> p
     boolean DOES_NOT_USE_IDNETIFIER_NAME_STRING -> k
@@ -38019,7 +38213,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.H0.e:
+com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo -> com.android.tools.r8.D.e.G0.e:
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo asMutableFieldOptimizationInfo() -> a
     boolean cannotBeKept() -> b
@@ -38029,7 +38223,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.H0.g:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo -> com.android.tools.r8.D.e.G0.g:
     long getReturnedConstantNumber() -> A
     com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility() -> B
     java.util.Set getInitializedClassesOnNormalExit() -> C
@@ -38063,13 +38257,106 @@
     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.H0.f:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference -> com.android.tools.r8.D.e.G0.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.H0.k:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector -> com.android.tools.r8.D.e.G0.i:
+    com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
+    com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.utils.InternalOptions options -> b
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():62:62 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView):67:70 -> <init>
+    1:57:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):109:165 -> a
+    58:101:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):140:183 -> a
+    102:105:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):445:448 -> a
+    106:112:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):447:453 -> a
+    113:113:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):452:452 -> a
+    114:114:boolean triggersClassInitializationBeforeSideEffect(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):465:465 -> a
+    115:131:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$triggersClassInitializationBeforeSideEffect$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):468:484 -> a
+    132:190:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):496:554 -> a
+    191:230:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):515:554 -> a
+    231:243:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):542:554 -> a
+    244:244:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):565:565 -> a
+    245:249:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):568:572 -> a
+    250:265:boolean isKotlinNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):648:663 -> a
+    250:265:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):574 -> a
+    266:285:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):575:594 -> a
+    286:291:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):593:598 -> a
+    292:299:boolean isInstantiationOfNullPointerException(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.graph.DexItemFactory):682:689 -> a
+    292:299:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):598 -> a
+    300:320:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):599:619 -> a
+    321:323:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):671:673 -> a
+    324:332:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):701:709 -> a
+    333:333:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    333:333:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):709 -> a
+    334:341:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):712:719 -> a
+    342:348:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):726:732 -> a
+    349:349:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    349:349:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):727 -> a
+    350:350:boolean lambda$computeMayHaveSideEffects$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):774:774 -> a
+    351:382:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):847:878 -> a
+    383:428:boolean isNormalExitDominated(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):900:945 -> a
+    383:428:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):879 -> a
+    429:434:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):885:890 -> a
+    1:40:void identifyReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):216:255 -> b
+    41:52:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):740:751 -> b
+    53:62:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:50 -> b
+    53:62:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    63:63:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    63:63:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):50 -> b
+    63:63:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    64:67:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):51:54 -> b
+    64:67:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    68:68:com.android.tools.r8.ir.analysis.AbstractError com.android.tools.r8.ir.code.Instruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):539:539 -> b
+    68:68:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):55 -> b
+    68:68:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    69:77:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):55:63 -> b
+    69:77:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    78:78:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56:56 -> b
+    78:78:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    79:79:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    79:79:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):50 -> b
+    79:79:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    80:93:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):69:82 -> b
+    80:93:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    94:149:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):75:130 -> b
+    94:149:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    150:150:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():31:31 -> b
+    150:150:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):753 -> b
+    151:152:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):754:755 -> b
+    153:153:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.canBePostponed():27:27 -> b
+    153:153:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):756 -> b
+    154:154:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):757:757 -> b
+    155:155:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():31:31 -> b
+    155:155:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):753 -> b
+    156:159:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):762:765 -> b
+    160:168:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):784:792 -> b
+    160:168:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):765 -> b
+    169:173:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):773:777 -> b
+    1:17:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):261:277 -> c
+    18:87:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeInstanceInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.function.Function):371:440 -> c
+    18:87:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):277 -> c
+    88:144:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeClassInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):290:346 -> c
+    88:144:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):278 -> c
+    145:202:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeClassInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):296:353 -> c
+    145:202:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):278 -> c
+    203:203:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):274:274 -> c
+    204:226:void computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):820:842 -> c
+    1:7:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):807:813 -> d
+    8:8:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> d
+    8:8:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):811 -> d
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect -> com.android.tools.r8.D.e.G0.h:
+    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect DESIRED_EFFECT -> a
+    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect NO_EFFECT -> d
+    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect OTHER_EFFECT -> c
+    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect CONDITIONAL_EFFECT -> b
+    1:4:void <clinit>():638:641 -> <clinit>
+    1:1:void <init>(java.lang.String,int):637:637 -> <init>
+com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo -> com.android.tools.r8.D.e.G0.m:
     java.util.Map callSiteInfos -> b
     com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection cachedRepresentative -> c
     boolean $assertionsDisabled -> d
@@ -38103,8 +38390,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.H0.h:
-com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection -> com.android.tools.r8.D.e.H0.j:
+com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$1 -> com.android.tools.r8.D.e.G0.j:
+com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection -> com.android.tools.r8.D.e.G0.l:
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement[] dynamicTypes -> a
     com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection BOTTOM -> b
     boolean $assertionsDisabled -> c
@@ -38122,11 +38409,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.H0.i:
+com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection$1 -> com.android.tools.r8.D.e.G0.k:
     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.H0.l:
+com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo -> com.android.tools.r8.D.e.G0.n:
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement dynamicType -> d
     boolean cannotBeKept -> b
     boolean valueHasBeenPropagated -> c
@@ -38150,7 +38437,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.H0.n:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.D.e.G0.p:
     1:1:void <init>():20:20 -> <init>
     void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
@@ -38190,10 +38477,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.H0.m:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer -> com.android.tools.r8.D.e.G0.o:
     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.H0.o:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed -> com.android.tools.r8.D.e.G0.q:
     java.util.Map fieldOptimizationInfos -> a
     java.util.Map methodOptimizationInfos -> b
     java.util.Map processed -> c
@@ -38235,7 +38522,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.H0.q:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore -> com.android.tools.r8.D.e.G0.s:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore INSTANCE -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():24:24 -> <init>
@@ -38268,9 +38555,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.H0.p:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore$1 -> com.android.tools.r8.D.e.G0.r:
     1:1:void <init>():22:22 -> <init>
-com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.D.e.H0.r:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.D.e.G0.t:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple INSTANCE -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():24:24 -> <init>
@@ -38305,7 +38592,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.H0.u:
+com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo -> com.android.tools.r8.D.e.G0.w:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList parametersUsages -> a
     1:1:void <clinit>():27:27 -> <clinit>
@@ -38313,7 +38600,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.H0.s:
+com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage -> com.android.tools.r8.D.e.G0.u:
     java.util.List callsReceiver -> c
     boolean hasFieldRead -> e
     boolean isAssignedToField -> f
@@ -38323,7 +38610,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.H0.t:
+com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsageBuilder -> com.android.tools.r8.D.e.G0.v:
     boolean $assertionsDisabled -> i
     java.util.Set ifZeroTestTypes -> c
     java.util.List callsOnReceiver -> d
@@ -38357,7 +38644,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.H0.v:
+com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo -> com.android.tools.r8.D.e.G0.x:
     boolean returnsConstantNumber -> i
     boolean returnsConstantString -> k
     boolean initializerEnablingJavaAssertions -> u
@@ -38386,120 +38673,216 @@
     boolean neverReturnsNull -> g
     boolean cannotBeKept -> a
     1:1:void <clinit>():23:23 -> <clinit>
-    1:1:void <init>():81:81 -> <init>
-    2:56:void <init>():25:79 -> <init>
-    57:57:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):85:85 -> <init>
-    58:139:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):25:106 -> <init>
-    1:2:long getReturnedConstantNumber():247:248 -> A
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility():242:242 -> B
-    1:1:java.util.Set getInitializedClassesOnNormalExit():166:166 -> C
-    1:1:boolean isInitializerEnablingJavaAssertions():259:259 -> D
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo():171:171 -> E
-    1:1:java.util.BitSet getNonNullParamOrThrow():181:181 -> F
-    1:1:void markAsPropagated():425:425 -> G
-    1:1:void markCannotBeKept():142:142 -> H
-    1:1:void markClassInitializerMayBePostponed():151:151 -> I
-    1:2:void markForceInline():392:393 -> J
-    1:1:void markMayNotHaveSideEffects():336:336 -> K
-    1:2:void markNeverInline():406:407 -> L
-    1:1:void markNeverReturnsNormally():348:348 -> M
-    1:1:void markNeverReturnsNull():344:344 -> N
-    1:1:void markReturnValueOnlyDependsOnArguments():340:340 -> O
-    1:1:void markUseIdentifierNameString():412:412 -> P
-    1:1:void setInitializerEnablingJavaAssertions():322:322 -> Q
-    1:6:void fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):111:116 -> a
-    7:7:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage getParameterUsages(int):176:176 -> a
-    8:8:void setParameterUsages(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo):298:298 -> a
-    9:9:void setNonNullParamOnNormalExits(java.util.BitSet):306:306 -> a
-    10:10:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):314:314 -> a
-    11:11:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):318:318 -> a
-    12:12:void markInitializesClassesOnNormalExit(java.util.Set):326:326 -> a
-    13:17:void markReturnsConstantNumber(long):352:356 -> a
-    18:22:void markReturnsConstantString(com.android.tools.r8.graph.DexString):360:364 -> a
-    23:29:void markReturnsObjectOfType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):368:374 -> a
-    30:36:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):378:384 -> a
-    37:42:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):381:386 -> a
-    43:43:void markCheckNullReceiverBeforeAnySideEffect(boolean):416:416 -> a
-    44:45:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo mutableCopy():435:436 -> a
-    1:1:java.util.BitSet getNonNullParamOnNormalExits():186:186 -> b
-    2:2:void setNonNullParamOrThrow(java.util.BitSet):302:302 -> b
-    3:5:void markReturnsArgument(int):330:332 -> b
-    6:6:void markTriggerClassInitBeforeAnySideEffect(boolean):420:420 -> b
-    1:1:boolean cannotBeKept():137:137 -> c
-    2:2:void setReachabilitySensitive(boolean):310:310 -> c
-    1:1:boolean checksNullReceiverBeforeAnySideEffect():279:279 -> d
-    1:1:boolean returnValueHasBeenPropagated():430:430 -> e
-    1:1:boolean classInitializerMayBePostponed():147:147 -> f
-    1:2:int getReturnedArgument():210:211 -> g
-    1:2:com.android.tools.r8.graph.DexString getReturnedConstantString():253:254 -> h
-    1:1:boolean returnValueOnlyDependsOnArguments():294:294 -> i
-    1:1:boolean neverInline():274:274 -> j
-    1:1:boolean neverReturnsNormally():221:221 -> k
-    1:2:boolean returnsConstant():226:227 -> l
-    1:1:boolean returnsConstantString():237:237 -> m
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicReturnType():156:156 -> n
-    1:1:boolean useIdentifierNameString():264:264 -> o
-    1:1:boolean triggersClassInitBeforeAnySideEffect():284:284 -> p
-    1:1:boolean returnsConstantNumber():232:232 -> q
-    1:1:boolean returnsArgument():205:205 -> r
+    1:1:void <init>():83:83 -> <init>
+    2:58:void <init>():25:81 -> <init>
+    59:59:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):87:87 -> <init>
+    60:143:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):25:108 -> <init>
+    1:2:long getReturnedConstantNumber():249:250 -> A
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility():244:244 -> B
+    1:1:java.util.Set getInitializedClassesOnNormalExit():168:168 -> C
+    1:1:boolean isInitializerEnablingJavaAssertions():261:261 -> D
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo():173:173 -> E
+    1:1:java.util.BitSet getNonNullParamOrThrow():183:183 -> F
+    1:41:void adjustOptimizationInfoAfterRemovingThisParameter():444:484 -> G
+    1:1:void markAsPropagated():427:427 -> H
+    1:1:void markCannotBeKept():144:144 -> I
+    1:1:void markClassInitializerMayBePostponed():153:153 -> J
+    1:2:void markForceInline():394:395 -> K
+    1:1:void markMayNotHaveSideEffects():338:338 -> L
+    1:2:void markNeverInline():408:409 -> M
+    1:1:void markNeverReturnsNormally():350:350 -> N
+    1:1:void markNeverReturnsNull():346:346 -> O
+    1:1:void markReturnValueOnlyDependsOnArguments():342:342 -> P
+    1:1:void markUseIdentifierNameString():414:414 -> Q
+    1:1:void setInitializerEnablingJavaAssertions():324:324 -> R
+    1:6:void fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):113:118 -> a
+    7:7:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage getParameterUsages(int):178:178 -> a
+    8:8:void setParameterUsages(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo):300:300 -> a
+    9:9:void setNonNullParamOnNormalExits(java.util.BitSet):308:308 -> a
+    10:10:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):316:316 -> a
+    11:11:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):320:320 -> a
+    12:12:void markInitializesClassesOnNormalExit(java.util.Set):328:328 -> a
+    13:17:void markReturnsConstantNumber(long):354:358 -> a
+    18:22:void markReturnsConstantString(com.android.tools.r8.graph.DexString):362:366 -> a
+    23:29:void markReturnsObjectOfType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):370:376 -> a
+    30:36:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):380:386 -> a
+    37:42:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):383:388 -> a
+    43:43:void markCheckNullReceiverBeforeAnySideEffect(boolean):418:418 -> a
+    44:45:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo mutableCopy():437:438 -> a
+    1:1:java.util.BitSet getNonNullParamOnNormalExits():188:188 -> b
+    2:2:void setNonNullParamOrThrow(java.util.BitSet):304:304 -> b
+    3:5:void markReturnsArgument(int):332:334 -> b
+    6:6:void markTriggerClassInitBeforeAnySideEffect(boolean):422:422 -> b
+    1:1:boolean cannotBeKept():139:139 -> c
+    2:2:void setReachabilitySensitive(boolean):312:312 -> c
+    1:1:boolean checksNullReceiverBeforeAnySideEffect():281:281 -> d
+    1:1:boolean returnValueHasBeenPropagated():432:432 -> e
+    1:1:boolean classInitializerMayBePostponed():149:149 -> f
+    1:2:int getReturnedArgument():212:213 -> g
+    1:2:com.android.tools.r8.graph.DexString getReturnedConstantString():255:256 -> h
+    1:1:boolean returnValueOnlyDependsOnArguments():296:296 -> i
+    1:1:boolean neverInline():276:276 -> j
+    1:1:boolean neverReturnsNormally():223:223 -> k
+    1:2:boolean returnsConstant():228:229 -> l
+    1:1:boolean returnsConstantString():239:239 -> m
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicReturnType():158:158 -> n
+    1:1:boolean useIdentifierNameString():266:266 -> o
+    1:1:boolean triggersClassInitBeforeAnySideEffect():286:286 -> p
+    1:1:boolean returnsConstantNumber():234:234 -> q
+    1:1:boolean returnsArgument():207:207 -> r
     boolean isUpdatableMethodOptimizationInfo() -> s
-    1:1:boolean neverReturnsNull():216:216 -> t
-    1:1:boolean isReachabilitySensitive():200:200 -> u
+    1:1:boolean neverReturnsNull():218:218 -> t
+    1:1:boolean isReachabilitySensitive():202:202 -> u
     com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo asUpdatableMethodOptimizationInfo() -> v
-    1:1:boolean forceInline():269:269 -> w
+    1:1:boolean forceInline():271:271 -> w
     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.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.D.e.I0.a:
+    1:1:boolean mayHaveSideEffects():291:291 -> y
+    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType():163:163 -> z
+com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.D.e.H0.a:
+    boolean $assertionsDisabled -> a
+    1:1:void <clinit>():14:14 -> <clinit>
+    1:3:void collectAllMonitorEnterValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):20:22 -> a
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    4:4:void collectAllMonitorEnterValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):22 -> a
+    5:5:void collectAllMonitorEnterValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):23:23 -> a
+    6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    6:6:void collectAllMonitorEnterValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):22 -> a
+    7:7:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32:32 -> a
+    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    8:8:boolean com.android.tools.r8.ir.code.Value.hasAliasedValue():243 -> a
+    8:8:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32 -> a
+    9:9:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32:32 -> a
+    10:10:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    10:10:boolean com.android.tools.r8.ir.code.Value.hasAliasedValue():243 -> a
+    10:10:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32 -> a
+    11:14:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):33:36 -> a
+    15:15:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):34:34 -> a
+com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.D.e.H0.b:
     com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter INSTANCE -> a
-    1:1:void <clinit>():13:13 -> <clinit>
-    1:1:void <init>():16:16 -> <init>
-    void reportInstructionBudgetIsExceeded() -> a
-    void reportPotentialExplosionInExceptionalControlFlowResolutionBlocks(int,int) -> a
+    1:1:void <clinit>():15:15 -> <clinit>
+    1:1:void <init>():18:18 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter getInstance():21:21 -> A
+    void reportBlacklisted() -> a
+    void reportIncorrectArity(int,int) -> a
+    void reportInvalidInliningReason(com.android.tools.r8.ir.optimize.Inliner$Reason,java.util.Set) -> 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 reportCallerNotSameClass() -> b
+    void reportPotentialExplosionInExceptionalControlFlowResolutionBlocks(int,int) -> b
+    void reportCallerNotSameNest() -> c
+    void reportWillExceedInstructionBudget(int,int) -> c
+    void reportCallerNotSamePackage() -> d
+    void reportWillExceedMonitorEnterValuesBudget(int,int) -> d
+    void reportCallerNotSubtype() -> e
+    void reportClasspathMethod() -> f
+    void reportInaccessible() -> g
+    void reportInlineeDoesNotHaveCode() -> h
+    void reportInlineeNotInliningCandidate() -> i
+    void reportInlineeNotProcessed() -> j
+    void reportInlineeNotSimple() -> k
+    void reportInlineeRefersToClassesNotInMainDex() -> l
+    void reportInliningAcrossFeatureSplit() -> m
+    void reportInstructionBudgetIsExceeded() -> n
+    void reportInvalidDoubleInliningCandidate() -> o
+    void reportLibraryMethod() -> p
+    void reportMarkedAsNeverInline() -> q
+    void reportMustTriggerClassInitialization() -> r
+    void reportNoInliningIntoConstructorsWhenGeneratingClassFiles() -> s
+    void reportPinned() -> t
+    void reportProcessedConcurrently() -> u
+    void reportReceiverDefinitelyNull() -> v
+    void reportReceiverMaybeNull() -> w
+    void reportRecursiveMethod() -> x
+    void reportUnknownTarget() -> y
+    boolean verifyReasonHasBeenReported() -> z
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.D.e.H0.c:
+    1:1:void <init>():18:18 -> <init>
+    void reportBlacklisted() -> a
+    void reportIncorrectArity(int,int) -> a
+    void reportInvalidInliningReason(com.android.tools.r8.ir.optimize.Inliner$Reason,java.util.Set) -> 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:
+    1:5:com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter createFor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):22:26 -> a
+    6:20:void handleInvokeWithUnknownTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):31:45 -> a
+    void reportCallerNotSameClass() -> b
+    void reportPotentialExplosionInExceptionalControlFlowResolutionBlocks(int,int) -> b
+    void reportCallerNotSameNest() -> c
+    void reportWillExceedInstructionBudget(int,int) -> c
+    void reportCallerNotSamePackage() -> d
+    void reportWillExceedMonitorEnterValuesBudget(int,int) -> d
+    void reportCallerNotSubtype() -> e
+    void reportClasspathMethod() -> f
+    void reportInaccessible() -> g
+    void reportInlineeDoesNotHaveCode() -> h
+    void reportInlineeNotInliningCandidate() -> i
+    void reportInlineeNotProcessed() -> j
+    void reportInlineeNotSimple() -> k
+    void reportInlineeRefersToClassesNotInMainDex() -> l
+    void reportInliningAcrossFeatureSplit() -> m
+    void reportInstructionBudgetIsExceeded() -> n
+    void reportInvalidDoubleInliningCandidate() -> o
+    void reportLibraryMethod() -> p
+    void reportMarkedAsNeverInline() -> q
+    void reportMustTriggerClassInitialization() -> r
+    void reportNoInliningIntoConstructorsWhenGeneratingClassFiles() -> s
+    void reportPinned() -> t
+    void reportProcessedConcurrently() -> u
+    void reportReceiverDefinitelyNull() -> v
+    void reportReceiverMaybeNull() -> w
+    void reportRecursiveMethod() -> x
+    void reportUnknownTarget() -> y
+    boolean verifyReasonHasBeenReported() -> z
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.D.e.H0.d:
     com.android.tools.r8.graph.DexEncodedMethod callee -> a
     boolean $assertionsDisabled -> e
     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:
+    1:1:void <clinit>():16:16 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):25:25 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):22:28 -> <init>
+    1:11:void print(java.lang.String):32:42 -> a
+    12:12:void printWithExceededThreshold(java.lang.String,java.lang.String,int,int):47:47 -> a
+    13:13:void reportBlacklisted():52:52 -> a
+    14:14:void reportIncorrectArity(int,int):92:92 -> a
+    15:19:void reportInvalidInliningReason(com.android.tools.r8.ir.optimize.Inliner$Reason,java.util.Set):146:150 -> a
+    20:20:void reportInvalidInliningReason(com.android.tools.r8.ir.optimize.Inliner$Reason,java.util.Set):146:146 -> a
+    21:25:void reportUnsafeConstructorInliningDueToFinalFieldAssignment(com.android.tools.r8.ir.code.InstancePut):219:223 -> a
+    26:26:void reportUnsafeConstructorInliningDueToFinalFieldAssignment(com.android.tools.r8.ir.code.InstancePut):219:219 -> a
+    27:29:void reportUnsafeConstructorInliningDueToIndirectConstructorCall(com.android.tools.r8.ir.code.InvokeDirect):229:231 -> a
+    30:30:void reportUnsafeConstructorInliningDueToIndirectConstructorCall(com.android.tools.r8.ir.code.InvokeDirect):229:229 -> a
+    31:31:void reportUnsafeConstructorInliningDueToUninitializedObjectUse(com.android.tools.r8.ir.code.Instruction):237:237 -> a
+    1:1:void reportCallerNotSameClass():57:57 -> b
+    2:2:void reportPotentialExplosionInExceptionalControlFlowResolutionBlocks(int,int):184:184 -> b
+    1:1:void reportCallerNotSameNest():62:62 -> c
+    2:2:void reportWillExceedInstructionBudget(int,int):242:242 -> c
+    1:1:void reportCallerNotSamePackage():67:67 -> d
+    2:2:void reportWillExceedMonitorEnterValuesBudget(int,int):252:252 -> d
+    1:1:void reportCallerNotSubtype():74:74 -> e
+    1:1:void reportClasspathMethod():82:82 -> f
+    1:1:void reportInaccessible():87:87 -> g
+    1:1:void reportInlineeDoesNotHaveCode():102:102 -> h
+    1:1:void reportInlineeNotInliningCandidate():107:107 -> i
+    1:1:void reportInlineeNotProcessed():112:112 -> j
+    1:1:void reportInlineeNotSimple():117:117 -> k
+    1:1:void reportInlineeRefersToClassesNotInMainDex():124:124 -> l
+    1:1:void reportInliningAcrossFeatureSplit():131:131 -> m
+    1:1:void reportInstructionBudgetIsExceeded():136:136 -> n
+    1:1:void reportInvalidDoubleInliningCandidate():141:141 -> o
+    1:1:void reportLibraryMethod():156:156 -> p
+    1:1:void reportMarkedAsNeverInline():161:161 -> q
+    1:1:void reportMustTriggerClassInitialization():166:166 -> r
+    1:1:void reportNoInliningIntoConstructorsWhenGeneratingClassFiles():173:173 -> s
+    1:1:void reportPinned():178:178 -> t
+    1:1:void reportProcessedConcurrently():193:193 -> u
+    1:1:void reportReceiverDefinitelyNull():199:199 -> v
+    1:1:void reportReceiverMaybeNull():204:204 -> w
+    1:1:void reportRecursiveMethod():209:209 -> x
+    1:1:void reportUnknownTarget():214:214 -> y
+    1:1:boolean verifyReasonHasBeenReported():261:261 -> z
+com.android.tools.r8.ir.optimize.lambda.CaptureSignature -> com.android.tools.r8.D.e.I0.a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList SINGLE_LIST -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList EMPTY_LIST -> a
     boolean $assertionsDisabled -> c
@@ -38520,7 +38903,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.J0.d:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor -> com.android.tools.r8.D.e.I0.d:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy NoOp -> j
@@ -38564,7 +38947,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.J0.b:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor$1 -> com.android.tools.r8.D.e.I0.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
@@ -38576,7 +38959,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.J0.c:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy -> com.android.tools.r8.D.e.I0.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
@@ -38587,7 +38970,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.J0.g:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup -> com.android.tools.r8.D.e.I0.g:
     java.util.Map lambdas -> c
     com.android.tools.r8.ir.optimize.lambda.LambdaGroupId id -> a
     com.android.tools.r8.graph.DexType classType -> b
@@ -38612,7 +38995,7 @@
     11:24:java.lang.String createHash(java.util.List):182:195 -> b
     11:24:com.android.tools.r8.graph.DexProgramClass synthesizeClass(com.android.tools.r8.graph.DexItemFactory):174 -> b
     25:25:com.android.tools.r8.graph.DexProgramClass synthesizeClass(com.android.tools.r8.graph.DexItemFactory):174:174 -> b
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
+    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
     26:26:com.android.tools.r8.graph.DexProgramClass synthesizeClass(com.android.tools.r8.graph.DexItemFactory):173 -> b
     27:29:com.android.tools.r8.graph.DexProgramClass synthesizeClass(com.android.tools.r8.graph.DexItemFactory):173:175 -> b
     30:30:java.lang.String createHash(java.util.List):197:197 -> b
@@ -38625,14 +39008,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.J0.e:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo -> com.android.tools.r8.D.e.I0.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.J0.f:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError -> com.android.tools.r8.D.e.I0.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.J0.h:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder -> com.android.tools.r8.D.e.I0.h:
     java.lang.String origin -> n
     com.android.tools.r8.graph.DexItemFactory factory -> m
     com.android.tools.r8.ir.optimize.lambda.LambdaGroup group -> l
@@ -38652,9 +39035,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.J0.i:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroupId -> com.android.tools.r8.D.e.I0.i:
     com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup() -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger -> com.android.tools.r8.D.e.J0.n:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger -> com.android.tools.r8.D.e.I0.n:
     java.util.Map lambdas -> a
     java.util.Map groups -> b
     com.android.tools.r8.kotlin.Kotlin kotlin -> g
@@ -38670,49 +39053,55 @@
     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):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):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.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):0:0 -> a
+    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$300(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):86 -> a
+    2:2:com.android.tools.r8.ir.optimize.lambda.LambdaGroup getLambdaGroup(com.android.tools.r8.graph.DexType):146:146 -> a
+    2:2:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):408 -> a
+    2:2:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$300(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):86 -> a
+    3:3:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):409:409 -> a
+    3:3:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$300(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):86 -> a
+    4:4:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> a
+    5:5:void invalidateLambda(com.android.tools.r8.graph.DexType):138:138 -> a
+    6:6:void queueForProcessing(com.android.tools.r8.graph.DexEncodedMethod):150:150 -> a
+    6:6:void access$200(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod):86 -> a
+    7:40:void collectGroupCandidates(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):159:192 -> a
+    41:41:boolean lambda$collectGroupCandidates$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):160:160 -> a
+    42:42:int lambda$collectGroupCandidates$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):167:167 -> a
+    43:44:void processMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203:204 -> a
+    45:54:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):215:224 -> a
+    55:75:java.util.Map finalizeLambdaGroups():313:333 -> a
+    55:75:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):228 -> a
+    76:109:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):231:264 -> a
+    110:124:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):263:277 -> a
+    125:125:void lambda$applyLambdaClassMapping$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):232:232 -> a
+    126:126:com.android.tools.r8.ir.optimize.lambda.CodeProcessor lambda$applyLambdaClassMapping$7(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):242:242 -> a
+    127:127:void lambda$applyLambdaClassMapping$8(com.android.tools.r8.graph.DexEncodedMethod):258:258 -> a
+    128:128:boolean lambda$applyLambdaClassMapping$10(com.android.tools.r8.ir.optimize.lambda.LambdaGroup):266:266 -> a
+    129:131:boolean lambda$applyLambdaClassMapping$9(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):268:270 -> a
+    132:136:void analyzeReferencesInProgramClasses(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):282:286 -> a
+    137:156:void analyzeLambdaClassesStructure(java.util.concurrent.ExecutorService):290:309 -> a
+    157:157:void lambda$analyzeLambdaClassesStructure$13(java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):295:295 -> a
+    158:163:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):297:302 -> a
+    164:169:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):300:305 -> a
+    170:170:void invalidateLambda(com.android.tools.r8.graph.DexType):138:138 -> a
+    170:170:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):305 -> a
+    171:177:void removeTrivialLambdaGroups():339:345 -> a
+    178:188:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):353:363 -> a
+    189:202:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):362:375 -> a
+    203:207:java.lang.Object lambda$rewriteLambdaReferences$16(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):365:369 -> a
+    208:214:java.lang.Object lambda$rewriteLambdaReferences$16(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):365:371 -> a
+    215:216:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):379:380 -> a
+    215:216:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
+    217:218:void com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor.accept(com.android.tools.r8.graph.DexTypeList):108:109 -> a
+    217:218:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):380 -> a
+    217:218:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
+    219:241:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):381:403 -> a
+    219:241:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
+    242:242:void com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor.accept(com.android.tools.r8.graph.DexTypeList):108:108 -> a
+    242:242:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):380 -> a
+    242:242:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$100(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> b
-    2:2:void invalidateLambda(com.android.tools.r8.graph.DexType):138:138 -> b
+    2:2:boolean isMergeableLambda(com.android.tools.r8.graph.DexType):142:142 -> b
     3:5:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):163:165 -> b
     6:6:boolean com.android.tools.r8.kotlin.KotlinSyntheticClass.isLambda():48:48 -> b
     6:6:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):165 -> b
@@ -38723,12 +39112,10 @@
     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
+    2:2:void lambda$new$0(com.android.tools.r8.graph.DexType):133:133 -> c
     1:1:java.util.Map access$500(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> d
-    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$1 -> com.android.tools.r8.D.e.I0.j:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalysisStrategy -> com.android.tools.r8.D.e.I0.k:
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> 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>
@@ -38740,7 +39127,7 @@
     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:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy -> com.android.tools.r8.D.e.I0.l:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer optimizationInfoFixer -> l
     java.util.Set typeAffectedValues -> m
@@ -38760,7 +39147,7 @@
     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:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer -> com.android.tools.r8.D.e.I0.m:
     java.util.Map lambdaGroupsClasses -> a
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> b
     boolean $assertionsDisabled -> c
@@ -38771,7 +39158,7 @@
     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:
+com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor -> com.android.tools.r8.D.e.I0.o:
     java.util.function.Consumer onLambdaType -> c
     java.util.function.Predicate isLambdaType -> b
     boolean $assertionsDisabled -> d
@@ -38809,7 +39196,7 @@
     63:63:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
     63:63:void accept(com.android.tools.r8.graph.DexMethodHandle):83 -> a
     64:65:void accept(com.android.tools.r8.graph.DexMethodHandle):83:84 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.ClassInitializerSourceCode -> com.android.tools.r8.D.e.J0.p.a:
+com.android.tools.r8.ir.optimize.lambda.kotlin.ClassInitializerSourceCode -> com.android.tools.r8.D.e.I0.p.a:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> m
     com.android.tools.r8.graph.DexItemFactory factory -> l
@@ -38822,35 +39209,35 @@
     1:1:void lambda$prepareInstructions$3(int,int,com.android.tools.r8.ir.conversion.IRBuilder):62:62 -> c
     1:3:void prepareInstructions():35:37 -> h
     4:35:void prepareInstructions():36:67 -> h
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup -> com.android.tools.r8.D.e.J0.p.g:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup -> com.android.tools.r8.D.e.I0.p.g:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId,com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1):104:104 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId):106:106 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):111:111 -> a
     2:2:com.android.tools.r8.utils.ThrowingConsumer lambdaClassValidator(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):117:117 -> a
     java.lang.String getGroupSuffix() -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1 -> com.android.tools.r8.D.e.J0.p.b:
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.D.e.J0.p.c:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1 -> com.android.tools.r8.D.e.I0.p.b:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.D.e.I0.p.c:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup,com.android.tools.r8.graph.DexItemFactory,java.lang.String):180:180 -> <init>
     1:4:com.android.tools.r8.ir.synthetic.SyntheticSourceCode createInstanceInitializerSourceCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):191:194 -> a
     5:5:com.android.tools.r8.graph.DexField lambda$createInstanceInitializerSourceCode$0(int):195:195 -> a
     1:1:com.android.tools.r8.graph.DexType getSuperClassType():185:185 -> j
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassValidator -> com.android.tools.r8.D.e.J0.p.d:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassValidator -> com.android.tools.r8.D.e.I0.p.d:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):152:152 -> <init>
     1:1:int getInstanceInitializerSize(java.util.List):157:157 -> a
     2:9:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):164:171 -> a
     10:10:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):167:167 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId -> com.android.tools.r8.D.e.J0.p.e:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId -> com.android.tools.r8.D.e.I0.p.e:
     1:1:void <init>(java.lang.String,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):130:130 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup():145:145 -> a
     java.lang.String getLambdaKindDescriptor() -> b
     1:1:boolean equals(java.lang.Object):135:135 -> equals
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.D.e.J0.p.f:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.D.e.I0.p.f:
     com.android.tools.r8.graph.DexMethod objectInitializer -> n
     1:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,java.util.function.IntFunction,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):213:214 -> <init>
     1:6:void lambda$prepareSuperConstructorCall$0(int,com.android.tools.r8.ir.conversion.IRBuilder):221:226 -> b
     7:7:void lambda$prepareSuperConstructorCall$0(int,com.android.tools.r8.ir.conversion.IRBuilder):221:221 -> b
     1:1:void prepareSuperConstructorCall(int):219:219 -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory -> com.android.tools.r8.D.e.J0.p.h:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory -> com.android.tools.r8.D.e.I0.p.h:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory INSTANCE -> m
     1:2:void <clinit>():16:17 -> <clinit>
@@ -38897,29 +39284,29 @@
     32:32:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
     33:33:void validateSuperclass(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):49:49 -> a
     33:33:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup -> com.android.tools.r8.D.e.J0.p.n:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup -> com.android.tools.r8.D.e.I0.p.n:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId,com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1):110:110 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId):112:112 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):117:117 -> a
     2:2:com.android.tools.r8.utils.ThrowingConsumer lambdaClassValidator(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):123:123 -> a
     java.lang.String getGroupSuffix() -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1 -> com.android.tools.r8.D.e.J0.p.i:
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.D.e.J0.p.j:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1 -> com.android.tools.r8.D.e.I0.p.i:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.D.e.I0.p.j:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup,com.android.tools.r8.graph.DexItemFactory,java.lang.String):191:191 -> <init>
     1:7:com.android.tools.r8.ir.synthetic.SyntheticSourceCode createInstanceInitializerSourceCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):202:208 -> a
     8:8:com.android.tools.r8.graph.DexField lambda$createInstanceInitializerSourceCode$0(int):206:206 -> a
     1:1:com.android.tools.r8.graph.DexType getSuperClassType():196:196 -> j
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassValidator -> com.android.tools.r8.D.e.J0.p.k:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassValidator -> com.android.tools.r8.D.e.I0.p.k:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):158:158 -> <init>
     1:1:int getInstanceInitializerSize(java.util.List):163:163 -> a
     2:14:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):170:182 -> a
     15:15:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):178:178 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId -> com.android.tools.r8.D.e.J0.p.l:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId -> com.android.tools.r8.D.e.I0.p.l:
     1:1:void <init>(java.lang.String,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):136:136 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup():151:151 -> a
     java.lang.String getLambdaKindDescriptor() -> b
     1:1:boolean equals(java.lang.Object):141:141 -> equals
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.D.e.J0.p.m:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.D.e.I0.p.m:
     int arity -> n
     com.android.tools.r8.graph.DexMethod lambdaInitializer -> o
     1:4:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,java.util.function.IntFunction,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.ir.code.Position):227:230 -> <init>
@@ -38928,7 +39315,7 @@
     2:7:void lambda$prepareSuperConstructorCall$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):239:244 -> b
     8:8:void lambda$prepareSuperConstructorCall$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):239:239 -> b
     1:3:void prepareSuperConstructorCall(int):235:237 -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroupIdFactory -> com.android.tools.r8.D.e.J0.p.o:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroupIdFactory -> com.android.tools.r8.D.e.I0.p.o:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory INSTANCE -> m
     1:2:void <clinit>():16:17 -> <clinit>
@@ -38982,7 +39369,7 @@
     36:36:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
     37:37:void validateSuperclass(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):49:49 -> a
     37:37:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinInstanceInitializerSourceCode -> com.android.tools.r8.D.e.J0.p.p:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinInstanceInitializerSourceCode -> com.android.tools.r8.D.e.I0.p.p:
     com.android.tools.r8.graph.DexField idField -> l
     java.util.function.IntFunction fieldGenerator -> m
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,java.util.function.IntFunction,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):25:27 -> <init>
@@ -38991,7 +39378,7 @@
     3:3:void lambda$prepareInstructions$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):41:41 -> b
     1:17:void prepareInstructions():32:48 -> h
     void prepareSuperConstructorCall(int) -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaClassValidator -> com.android.tools.r8.D.e.J0.p.q:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaClassValidator -> com.android.tools.r8.D.e.I0.p.q:
     com.android.tools.r8.graph.AppInfoWithSubtyping appInfo -> c
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> b
     com.android.tools.r8.kotlin.Kotlin kotlin -> a
@@ -39073,14 +39460,14 @@
     208:208:void accept(java.lang.Object):47 -> accept
     209:228:void accept(com.android.tools.r8.graph.DexClass):96:115 -> accept
     209:228:void accept(java.lang.Object):47 -> accept
-    229:229:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> accept
+    229:229:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> accept
     229:229:void accept(com.android.tools.r8.graph.DexClass):114 -> accept
     229:229:void accept(java.lang.Object):47 -> accept
     230:234:void accept(com.android.tools.r8.graph.DexClass):117:121 -> accept
     230:234:void accept(java.lang.Object):47 -> accept
     235:235:void accept(com.android.tools.r8.graph.DexClass):73:73 -> accept
     235:235:void accept(java.lang.Object):47 -> accept
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaConstants -> com.android.tools.r8.D.e.J0.p.r:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaConstants -> com.android.tools.r8.D.e.I0.p.r:
     com.android.tools.r8.graph.FieldAccessFlags CAPTURE_FIELD_FLAGS -> j
     com.android.tools.r8.graph.FieldAccessFlags SINGLETON_FIELD_FLAGS -> i
     com.android.tools.r8.graph.MethodAccessFlags CLASS_INITIALIZER_FLAGS -> c
@@ -39093,7 +39480,7 @@
     com.android.tools.r8.graph.MethodAccessFlags BRIDGE_METHOD_FLAGS -> g
     com.android.tools.r8.graph.MethodAccessFlags BRIDGE_METHOD_FLAGS_FIXED -> h
     1:38:void <clinit>():15:52 -> <clinit>
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup -> com.android.tools.r8.D.e.J0.p.s:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup -> com.android.tools.r8.D.e.I0.p.s:
     com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategy -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():19:19 -> <clinit>
@@ -39111,7 +39498,7 @@
     9:9:com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id():27:27 -> a
     9:9:com.android.tools.r8.graph.DexField getCaptureField(com.android.tools.r8.graph.DexItemFactory,int):78 -> a
     10:10:com.android.tools.r8.graph.DexField getCaptureField(com.android.tools.r8.graph.DexItemFactory,int):78:78 -> a
-    11:11:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1239:1239 -> a
+    11:11:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1242:1242 -> a
     11:11:com.android.tools.r8.graph.DexField getCaptureField(com.android.tools.r8.graph.DexItemFactory,int):77 -> a
     1:2:com.android.tools.r8.graph.DexField getSingletonInstanceField(com.android.tools.r8.graph.DexItemFactory,int):46:47 -> b
     3:3:com.android.tools.r8.graph.DexField getSingletonInstanceField(com.android.tools.r8.graph.DexItemFactory,int):46:46 -> b
@@ -39120,7 +39507,7 @@
     1:1:com.android.tools.r8.graph.DexProto createConstructorProto(com.android.tools.r8.graph.DexItemFactory):57 -> c
     2:8:com.android.tools.r8.graph.DexProto createConstructorProto(com.android.tools.r8.graph.DexItemFactory):57:63 -> c
     1:1:com.android.tools.r8.graph.DexField getLambdaIdField(com.android.tools.r8.graph.DexItemFactory):67:67 -> d
-    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1239:1239 -> d
+    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1242:1242 -> d
     2:2:com.android.tools.r8.graph.DexField getLambdaIdField(com.android.tools.r8.graph.DexItemFactory):67 -> d
     1:1:com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id():27:27 -> e
     1:1:java.lang.String getTypePackage():52 -> e
@@ -39131,7 +39518,7 @@
     1:1:com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id():27:27 -> j
     1:1:boolean isStateless():31 -> j
     2:2:boolean isStateless():31:31 -> j
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupClassBuilder -> com.android.tools.r8.D.e.J0.p.t:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupClassBuilder -> com.android.tools.r8.D.e.I0.p.t:
     boolean $assertionsDisabled -> p
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id -> o
     1:1:void <clinit>():36:36 -> <clinit>
@@ -39161,7 +39548,7 @@
     1:25:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():90:114 -> i
     26:44:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():109:127 -> i
     1:3:java.util.Map collectVirtualMethods():135:137 -> l
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupCodeStrategy -> com.android.tools.r8.D.e.J0.p.u:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupCodeStrategy -> com.android.tools.r8.D.e.I0.p.u:
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():35:35 -> <clinit>
@@ -39173,13 +39560,13 @@
     13:20:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):116:123 -> a
     21:21:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     21:21:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):123 -> a
-    22:22:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    22:22:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     22:22:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):122 -> a
     23:28:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):122:127 -> a
     29:31:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):132:134 -> a
     32:36:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):212:216 -> a
     32:36:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):134 -> a
-    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     37:37:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):216 -> a
     37:37:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):134 -> a
     38:47:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):217:226 -> a
@@ -39233,13 +39620,13 @@
     118:121:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):194:197 -> a
     122:122:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     122:122:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):197 -> a
-    123:123:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    123:123:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     123:123:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):196 -> a
     124:130:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):196:202 -> a
     131:134:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):234:237 -> a
     135:135:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     135:135:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):237 -> a
-    136:136:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    136:136:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     136:136:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):236 -> a
     1:5:boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):70:74 -> b
     6:15:boolean isValidInitializerCall(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):96:105 -> b
@@ -39248,7 +39635,7 @@
     17:17:boolean isValidInitializerCall(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):105:105 -> b
     1:4:boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):61:64 -> c
     1:1:boolean isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):79:79 -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId -> com.android.tools.r8.D.e.J0.p.v:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId -> com.android.tools.r8.D.e.I0.p.v:
     com.android.tools.r8.graph.DexProto mainMethodProto -> g
     com.android.tools.r8.graph.ParameterAnnotationsList mainMethodParamAnnotations -> i
     int innerClassAccess -> k
@@ -39271,7 +39658,7 @@
     8:8:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> toString
     8:8:java.lang.String toString():119 -> toString
     9:23:java.lang.String toString():119:133 -> toString
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory -> com.android.tools.r8.D.e.J0.p.w:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory -> com.android.tools.r8.D.e.I0.p.w:
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():22:22 -> <init>
@@ -39347,7 +39734,7 @@
     32:32:void validateStaticFields(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):140 -> b
     33:33:void validateStaticFields(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):140:140 -> b
     34:34:void validateStaticFields(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):136:136 -> b
-    35:35:java.lang.String com.android.tools.r8.graph.DexEncodedField.toSourceString():90:90 -> b
+    35:35:java.lang.String com.android.tools.r8.graph.DexEncodedField.toSourceString():89:89 -> b
     35:35:void validateStaticFields(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):136 -> b
     36:36:void validateStaticFields(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):136:136 -> b
     37:37:void com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError.<init>(java.lang.String):214:214 -> b
@@ -39364,7 +39751,7 @@
     11:11:com.android.tools.r8.graph.DexEncodedMethod validateVirtualMethods(com.android.tools.r8.graph.DexClass):61 -> c
     12:18:com.android.tools.r8.graph.DexEncodedMethod validateVirtualMethods(com.android.tools.r8.graph.DexClass):63:69 -> c
     19:24:boolean hasValidAnnotations(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):90:95 -> c
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaVirtualMethodSourceCode -> com.android.tools.r8.D.e.J0.p.x:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaVirtualMethodSourceCode -> com.android.tools.r8.D.e.I0.p.x:
     com.android.tools.r8.graph.DexItemFactory factory -> l
     java.util.List implMethods -> n
     com.android.tools.r8.graph.DexField idField -> m
@@ -39380,7 +39767,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.K0.a:
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher -> com.android.tools.r8.D.e.J0.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
@@ -39394,10 +39781,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.K0.b:
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockPeephole -> com.android.tools.r8.D.e.J0.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.K0.c:
+com.android.tools.r8.ir.optimize.peepholes.DupDupDupPeephole -> com.android.tools.r8.D.e.J0.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
@@ -39408,7 +39795,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.K0.d:
+com.android.tools.r8.ir.optimize.peepholes.LoadLoadDupPeephole -> com.android.tools.r8.D.e.J0.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
@@ -39417,10 +39804,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.K0.e:
+com.android.tools.r8.ir.optimize.peepholes.Match -> com.android.tools.r8.D.e.J0.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.K0.f:
+com.android.tools.r8.ir.optimize.peepholes.MoveLoadUpPeephole -> com.android.tools.r8.D.e.J0.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
@@ -39441,24 +39828,28 @@
     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.K0.g:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression -> com.android.tools.r8.D.e.J0.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.K0.h:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> com.android.tools.r8.D.e.J0.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
     2:4:boolean lambda$withoutLocalInfo$0(java.util.function.Predicate,com.android.tools.r8.ir.code.Instruction):18:20 -> a
     5:5:void resetNext(com.android.tools.r8.ir.code.InstructionListIterator,int):25:25 -> a
     6:7:int numberOfValuesConsumedFromStack(com.android.tools.r8.ir.code.Instruction):47:48 -> a
-    8:22:void moveInstructionsUpToCurrentPosition(com.android.tools.r8.ir.code.InstructionListIterator,java.util.List):57:71 -> a
-    23:23:boolean lambda$moveInstructionsUpToCurrentPosition$1(java.util.List,com.android.tools.r8.ir.code.Instruction):64:64 -> a
+    8:21:void moveInstructionsUpToCurrentPosition(com.android.tools.r8.ir.code.InstructionListIterator,java.util.List):57:70 -> a
+    22:24:java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate):18:20 -> a
+    22:24:java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate):0 -> a
+    22:24:void moveInstructionsUpToCurrentPosition(com.android.tools.r8.ir.code.InstructionListIterator,java.util.List):70 -> a
+    25:25:void moveInstructionsUpToCurrentPosition(com.android.tools.r8.ir.code.InstructionListIterator,java.util.List):71:71 -> a
+    26:26:boolean lambda$moveInstructionsUpToCurrentPosition$1(java.util.List,com.android.tools.r8.ir.code.Instruction):64:64 -> a
     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.K0.i:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout -> com.android.tools.r8.D.e.J0.i:
     com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[] expressions -> b
     java.util.List instructions -> a
     boolean backwards -> c
@@ -39473,7 +39864,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.K0.j:
+com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.D.e.J0.j:
     java.util.function.Predicate predicate -> a
     int index -> b
     boolean $assertionsDisabled -> c
@@ -39485,14 +39876,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.K0.k:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadPeephole -> com.android.tools.r8.D.e.J0.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.K0.l:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadToDupStorePeephole -> com.android.tools.r8.D.e.J0.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
@@ -39504,7 +39895,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.K0.m:
+com.android.tools.r8.ir.optimize.peepholes.StoreSequenceLoadPeephole -> com.android.tools.r8.D.e.J0.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
@@ -39518,7 +39909,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.K0.n:
+com.android.tools.r8.ir.optimize.peepholes.Wildcard -> com.android.tools.r8.D.e.J0.n:
     java.util.function.Predicate predicate -> a
     int index -> b
     boolean $assertionsDisabled -> c
@@ -39530,7 +39921,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.L0.e:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer -> com.android.tools.r8.D.e.K0.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
@@ -39557,7 +39948,7 @@
     110:113:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):175:178 -> a
     114:127:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):223:236 -> a
     128:134:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):235:241 -> a
-    135:135:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
+    135:135:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
     135:135:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):246 -> a
     136:145:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):246:255 -> a
     146:154:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processInstantiation(com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.NewInstance):341:349 -> a
@@ -39584,27 +39975,27 @@
     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:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     303:303:boolean lambda$analyzeAllValueUsers$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):510 -> a
     304:322:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):428:446 -> a
-    323:323:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    323:323:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     323:323:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):446 -> a
     324:324:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):447:447 -> a
-    325:325:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    325:325:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     325:325:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):446 -> a
     326:327:boolean isValidInitCall(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):452:453 -> a
     328:328:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):491:491 -> a
-    329:329:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    329:329:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     329:329:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):491 -> a
     330:375:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo analyzeAllValueUsers(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean):491:536 -> a
     376:377:void staticizeCandidates(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):559:560 -> a
     378:381:void setFixupStrategy(java.util.function.BiConsumer):571:574 -> a
     382:385:void cleanFixupStrategy():578:581 -> a
-    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> b
+    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     1:1:boolean lambda$isValidInitCall$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):438 -> b
     2:4:void fixupMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):564:566 -> b
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1 -> com.android.tools.r8.D.e.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$1 -> com.android.tools.r8.D.e.K0.a:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> com.android.tools.r8.D.e.K0.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):584:584 -> <init>
     2:3:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory):586:587 -> <init>
@@ -39621,7 +40012,7 @@
     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:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> com.android.tools.r8.D.e.K0.c:
     java.util.concurrent.atomic.AtomicInteger instancesCreated -> e
     com.android.tools.r8.graph.DexEncodedField singletonField -> b
     java.util.concurrent.atomic.AtomicInteger fieldWrites -> d
@@ -39636,19 +40027,19 @@
     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 -> com.android.tools.r8.D.e.K0.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>():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:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizerGraphLense -> com.android.tools.r8.D.e.K0.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.L0.g:
+com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor -> com.android.tools.r8.D.e.K0.g:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer classStaticizer -> b
     boolean $assertionsDisabled -> i
@@ -39728,11 +40119,11 @@
     172:172:void finalEligibilityCheck():156 -> a
     173:183:void finalEligibilityCheck():156:166 -> a
     184:200:void finalEligibilityCheck():165:181 -> a
-    201:201:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
+    201:201:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
     201:201:void finalEligibilityCheck():183 -> a
     202:213:void finalEligibilityCheck():183:194 -> a
     214:216:void finalEligibilityCheck():193:195 -> a
-    217:217:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> a
+    217:217:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
     217:217:void finalEligibilityCheck():183 -> a
     218:218:void finalEligibilityCheck():206:206 -> a
     219:219:boolean lambda$finalEligibilityCheck$0(com.android.tools.r8.graph.DexEncodedMethod):148:148 -> a
@@ -39755,28 +40146,28 @@
     280:280:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):278:278 -> a
     280:280:void lambda$rewriteReferences$5(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.StaticGet):326 -> a
     281:286:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):337:342 -> a
-    287:287:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    287:287:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     287:287:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):343 -> a
     288:289:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):344:345 -> a
-    290:290:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    290:290:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     290:290:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):343 -> a
     291:296:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):352:357 -> a
     297:297:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):364:364 -> a
-    298:298:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    298:298:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     298:298:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):364 -> a
     299:303:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):364:368 -> a
     304:321:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):367:384 -> a
     322:327:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):423:428 -> a
-    328:328:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    328:328:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     328:328:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):429 -> a
     329:335:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):430:436 -> a
-    336:336:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    336:336:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     336:336:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):429 -> a
     337:342:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):441:446 -> a
     343:348:void fixupStaticizedFieldReadUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):454:459 -> a
     349:366:void fixupStaticizedFieldReadUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):458:475 -> a
     367:376:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):479:488 -> a
-    377:377:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    377:377:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     377:377:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):488 -> a
     378:385:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):489:496 -> a
     386:386:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> a
@@ -39803,10 +40194,10 @@
     405:406:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):678:679 -> a
     407:407:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):677:677 -> a
     1:1:void removeReferencesToThis(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):304:304 -> b
-    1:1:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> c
+    1:1:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> c
     1:1:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):310 -> c
     2:22:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):310:330 -> c
-    23:23:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> c
+    23:23:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> c
     23:23:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):502 -> c
     23:23:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
     24:37:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):503:516 -> c
@@ -39832,10 +40223,10 @@
     75:75:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
     76:80:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):542:546 -> c
     76:80:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    81:81:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():875:875 -> c
+    81:81:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> c
     81:81:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):310 -> c
-com.android.tools.r8.ir.optimize.string.StringBuilderOptimizationConfiguration -> com.android.tools.r8.D.e.M0.a:
-com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer -> com.android.tools.r8.D.e.M0.g:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizationConfiguration -> com.android.tools.r8.D.e.L0.a:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer -> com.android.tools.r8.D.e.L0.g:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     int numberOfBuildersSimplified -> n
     int numberOfBuildersWithNonDeterministicArg -> l
@@ -39894,15 +40285,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.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$1 -> com.android.tools.r8.D.e.L0.b:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState -> com.android.tools.r8.D.e.L0.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.M0.d:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$DefaultStringBuilderOptimizationConfiguration -> com.android.tools.r8.D.e.L0.d:
     com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer this$0 -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():791:791 -> <clinit>
@@ -39914,7 +40305,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.M0.e:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringBuilderOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.D.e.L0.e:
     com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer this$0 -> b
     com.android.tools.r8.graph.DexType builderType -> a
     boolean $assertionsDisabled -> c
@@ -39929,20 +40320,20 @@
     54:54:boolean com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$DefaultStringBuilderOptimizationConfiguration.isBuilderInit(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):801:801 -> a
     54:54:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):904 -> a
     55:56:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):939:940 -> a
-    57:57:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    57:57:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     57:57:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):940 -> a
     58:59:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):941:942 -> a
-    60:60:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    60:60:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     60:60:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):940 -> a
     61:62:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):945:946 -> a
-    63:63:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    63:63:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     63:63:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):946 -> a
     64:65:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):947:948 -> a
-    66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     66:66:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):946 -> a
     67:67:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):952:952 -> a
     68:68:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):882:882 -> a
-com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis -> com.android.tools.r8.D.e.M0.f:
+com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis -> com.android.tools.r8.D.e.L0.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
@@ -39956,7 +40347,7 @@
     372:372:void <init>(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer,com.android.tools.r8.ir.code.IRCode):206:206 -> <init>
     1:28:java.util.Set findAllLocalBuilders():217:244 -> a
     1:28:java.util.Set access$000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis):191 -> a
-    29:29:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    29:29:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     29:29:java.util.Set findAllLocalBuilders():244 -> a
     29:29:java.util.Set access$000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis):191 -> a
     30:32:java.util.Set collectAllLinkedBuilders(com.android.tools.r8.ir.code.Value):257:259 -> a
@@ -39964,7 +40355,7 @@
     30:32:java.util.Set access$000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis):191 -> a
     33:36:java.util.Set findAllLocalBuilders():245:248 -> a
     33:36:java.util.Set access$000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis):191 -> a
-    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     37:37:java.util.Set findAllLocalBuilders():244 -> a
     37:37:java.util.Set access$000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis):191 -> a
     38:38:java.util.Set findAllLocalBuilders():253:253 -> a
@@ -39980,20 +40371,20 @@
     89:91:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
     92:93:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):362:363 -> a
     92:93:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
-    94:94:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    94:94:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     94:94:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):363 -> a
     94:94:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
     95:99:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):364:368 -> a
     95:99:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
-    100:100:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    100:100:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     100:100:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):368 -> a
     100:100:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
     101:110:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):369:378 -> a
     101:110:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
-    111:111:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    111:111:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     111:111:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):368 -> a
     111:111:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
-    112:112:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    112:112:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     112:112:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):363 -> a
     112:112:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
     113:113:boolean com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$DefaultStringBuilderOptimizationConfiguration.isBuilderInitWithInitialValue(com.android.tools.r8.ir.code.InvokeMethod):813:813 -> a
@@ -40001,30 +40392,30 @@
     113:113:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
     114:120:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):383:389 -> a
     114:120:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
-    121:121:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    121:121:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     121:121:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):389 -> a
     121:121:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
     122:125:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):392:395 -> a
     122:125:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
-    126:126:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    126:126:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     126:126:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):395 -> a
     126:126:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
     127:136:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):396:405 -> a
     127:136:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
-    137:137:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    137:137:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     137:137:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):395 -> a
     137:137:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
-    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     138:138:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):389 -> a
     138:138:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
     139:140:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):408:409 -> a
     139:140:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
-    141:141:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    141:141:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     141:141:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):409 -> a
     141:141:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
     142:151:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):412:421 -> a
     142:151:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
-    152:152:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    152:152:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     152:152:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):409 -> a
     152:152:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
     153:182:java.lang.String extractConstantArgument(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):432:461 -> a
@@ -40033,10 +40424,10 @@
     211:227:void logHistogramOfChains(java.util.List,boolean):548:564 -> a
     228:228:void logHistogramOfChains(java.util.List,boolean):559:559 -> a
     229:230:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):575:576 -> a
-    231:231:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    231:231:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     231:231:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):576 -> a
     232:239:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):577:584 -> a
-    240:240:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    240:240:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     240:240:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):584 -> a
     241:269:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):585:613 -> a
     270:275:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):611:616 -> a
@@ -40044,22 +40435,22 @@
     280:284:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):588:592 -> a
     285:289:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):590:594 -> a
     290:298:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):593:601 -> a
-    299:299:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    299:299:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     299:299:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):584 -> a
     300:301:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):621:622 -> a
     302:302:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     302:302:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):622 -> a
     303:303:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):622:622 -> a
-    304:304:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    304:304:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     304:304:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):576 -> a
     305:314:boolean isToStringOfInterest(java.util.Set,com.android.tools.r8.ir.code.Instruction):628:637 -> a
     305:314:boolean lambda$applyConcatenationResults$1(java.util.Set,com.android.tools.r8.ir.code.Instruction):578 -> a
-    315:315:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    315:315:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     315:315:boolean isToStringOfInterest(java.util.Set,com.android.tools.r8.ir.code.Instruction):637 -> a
     315:315:boolean lambda$applyConcatenationResults$1(java.util.Set,com.android.tools.r8.ir.code.Instruction):578 -> a
     316:332:boolean isToStringOfInterest(java.util.Set,com.android.tools.r8.ir.code.Instruction):638:654 -> a
     316:332:boolean lambda$applyConcatenationResults$1(java.util.Set,com.android.tools.r8.ir.code.Instruction):578 -> a
-    333:333:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    333:333:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     333:333:boolean isToStringOfInterest(java.util.Set,com.android.tools.r8.ir.code.Instruction):637 -> a
     333:333:boolean lambda$applyConcatenationResults$1(java.util.Set,com.android.tools.r8.ir.code.Instruction):578 -> a
     334:379:java.lang.String toCompileTimeString(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState):666:711 -> a
@@ -40067,50 +40458,50 @@
     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():879:879 -> a
+    392:392:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     392:392:void removeTrivialBuilders():734 -> a
     393:399:void removeTrivialBuilders():735:741 -> a
-    400:400:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    400:400:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     400:400:void removeTrivialBuilders():741 -> a
     401:402:void removeTrivialBuilders():741:742 -> a
-    403:403:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    403:403:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     403:403:void removeTrivialBuilders():741 -> a
     404:404:void removeTrivialBuilders():747:747 -> a
-    405:405:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    405:405:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     405:405:void removeTrivialBuilders():747 -> a
     406:412:void removeTrivialBuilders():748:754 -> a
-    413:413:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    413:413:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     413:413:void removeTrivialBuilders():754 -> a
     414:415:void removeTrivialBuilders():754:755 -> a
-    416:416:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    416:416:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     416:416:void removeTrivialBuilders():754 -> a
     417:421:void removeTrivialBuilders():758:762 -> a
-    422:422:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    422:422:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     422:422:void removeTrivialBuilders():762 -> a
     423:424:void removeTrivialBuilders():762:763 -> a
-    425:425:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    425:425:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     425:425:void removeTrivialBuilders():762 -> a
     426:426:void removeTrivialBuilders():767:767 -> a
-    427:427:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    427:427:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     427:427:void removeTrivialBuilders():767 -> a
     428:433:void removeTrivialBuilders():767:772 -> a
-    434:434:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    434:434:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     434:434:void removeTrivialBuilders():767 -> a
     435:435:void removeTrivialBuilders():777:777 -> a
-    436:436:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    436:436:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     436:436:void removeTrivialBuilders():777 -> a
     437:446:void removeTrivialBuilders():778:787 -> a
-    447:447:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    447:447:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     447:447:void removeTrivialBuilders():777 -> a
-    448:448:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    448:448:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     448:448:void removeTrivialBuilders():747 -> a
-    449:449:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    449:449:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     449:449:void removeTrivialBuilders():734 -> a
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$200(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191:191 -> b
     2:40:java.lang.Number extractConstantNumber(com.android.tools.r8.ir.code.Value):469:507 -> b
     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.M0.i:
+com.android.tools.r8.ir.optimize.string.StringOptimizer -> com.android.tools.r8.D.e.L0.i:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> j
@@ -40131,123 +40522,141 @@
     37:37:void lambda$logResult$0(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping,java.lang.Integer):86:86 -> a
     38:39:void lambda$logResult$2(java.lang.Integer,java.lang.Integer):100:101 -> a
     40:40:void lambda$logResult$2(java.lang.Integer,java.lang.Integer):100:100 -> a
-    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():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
-    59:59:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):149 -> a
-    60:65:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):150:155 -> a
-    66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    66:66:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):155 -> a
-    67:75:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):156:164 -> a
-    76:76:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    76:76:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):164 -> a
-    77:79:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):165:167 -> a
-    80:80:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    80:80:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):164 -> a
-    81:96:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):171:186 -> a
-    97:102:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):184:189 -> a
-    103:105:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):188:190 -> a
-    106:106:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    106:106:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):155 -> a
-    107:107:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    107:107:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):149 -> a
-    108:148:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):197:237 -> a
-    149:149:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    149:149:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):237 -> a
-    150:165:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):238:253 -> a
-    166:166:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    166:166:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):253 -> a
-    167:173:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):254:260 -> a
-    174:174:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    174:174:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):253 -> a
-    175:177:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):262:264 -> a
-    178:178:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    178:178:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):264 -> a
-    179:189:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):265:275 -> a
-    190:190:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    190:190:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):264 -> a
-    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):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():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():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
-    362:362:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.stringClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):363:363 -> a
-    362:362:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):429 -> a
-    363:363:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    363:363:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.stringClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):363 -> a
-    363:363:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):429 -> a
-    364:364:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.stringClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability) -> a
-    364:364:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):429 -> a
-    365:365:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):430:430 -> a
-    366:376:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):428:438 -> a
-    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):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
-    391:399:void logHistogramOfNames(com.android.tools.r8.ir.code.DexItemBasedConstString):483:491 -> a
+    41:44:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):133:136 -> a
+    45:45:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
+    45:45:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):137 -> a
+    46:58:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):138:150 -> a
+    59:59:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    59:59:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):150 -> a
+    60:65:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):151:156 -> a
+    66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    66:66:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):156 -> a
+    67:75:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):157:165 -> a
+    76:76:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    76:76:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):165 -> a
+    77:79:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):166:168 -> a
+    80:80:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    80:80:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):165 -> a
+    81:96:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):172:187 -> a
+    97:102:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):185:190 -> a
+    103:105:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):189:191 -> a
+    106:106:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    106:106:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):156 -> a
+    107:107:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    107:107:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):150 -> a
+    108:109:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):195:196 -> a
+    110:110:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    110:110:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):196 -> a
+    111:119:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):197:205 -> a
+    120:125:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):203:208 -> a
+    126:126:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    126:126:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):196 -> a
+    127:167:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):215:255 -> a
+    168:168:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    168:168:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):255 -> a
+    169:180:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):256:267 -> a
+    181:181:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    181:181:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):268 -> a
+    182:183:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):270:271 -> a
+    184:184:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    184:184:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):271 -> a
+    185:190:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):272:277 -> a
+    191:191:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    191:191:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):278 -> a
+    192:192:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    192:192:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):271 -> a
+    193:195:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):280:282 -> a
+    196:196:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    196:196:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):282 -> a
+    197:202:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):283:288 -> a
+    203:203:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    203:203:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):289 -> a
+    204:205:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):292:293 -> a
+    206:206:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    206:206:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):282 -> a
+    207:207:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    207:207:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):255 -> a
+    208:209:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):296:297 -> a
+    210:210:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    210:210:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):297 -> a
+    211:211:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):297:297 -> a
+    212:215:java.lang.Integer lambda$computeTrivialOperationsOnConstString$4(com.android.tools.r8.graph.DexString):218:221 -> a
+    216:216:java.lang.Integer lambda$computeTrivialOperationsOnConstString$10(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):235:235 -> a
+    217:217:java.lang.Integer lambda$computeTrivialOperationsOnConstString$13(com.android.tools.r8.graph.DexString,java.lang.Integer):241:241 -> a
+    218:221:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):304:307 -> a
+    222:222:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
+    222:222:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):309 -> a
+    223:252:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):310:339 -> a
+    253:253:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    253:253:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):339 -> a
+    254:283:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):340:369 -> a
+    284:284:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    284:284:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):374 -> a
+    285:326:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):375:416 -> a
+    327:377:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):397:447 -> a
+    378:378:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.stringClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):363:363 -> a
+    378:378:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):447 -> a
+    379:379: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
+    379:379:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.stringClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):363 -> a
+    379:379:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):447 -> a
+    380:380:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.stringClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):364:364 -> a
+    380:380:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):447 -> a
+    381:381:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):448:448 -> a
+    382:386:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):446:450 -> a
+    387:393:void logHistogramOfNames(com.android.tools.r8.graph.DexString):480:486 -> a
+    387:393:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):451 -> a
+    394:395:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):453:454 -> a
+    396:404:void logHistogramOfNames(com.android.tools.r8.ir.code.DexItemBasedConstString):501:509 -> a
+    396:404:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):456 -> a
+    405:405:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    405:405:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):339 -> a
+    406:407:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):461:462 -> a
+    408:408:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    408:408:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):462 -> a
+    409:412:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):462:465 -> a
+    413:418:void logDeferredNameComputation(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):491:496 -> a
     1:2:void lambda$logResult$1(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping,java.lang.Integer):93:94 -> b
     3:3:void lambda$logResult$1(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping,java.lang.Integer):93:93 -> b
     4:5:void lambda$logResult$3(java.lang.Integer,java.lang.Integer):108:109 -> b
     6:6:void lambda$logResult$3(java.lang.Integer,java.lang.Integer):108:108 -> b
-    7:7:java.lang.Integer lambda$computeTrivialOperationsOnConstString$5(com.android.tools.r8.graph.DexString):207:207 -> b
-    8:8:java.lang.Integer lambda$computeTrivialOperationsOnConstString$11(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):219:219 -> b
-    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():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
+    7:7:java.lang.Integer lambda$computeTrivialOperationsOnConstString$5(com.android.tools.r8.graph.DexString):225:225 -> b
+    8:8:java.lang.Integer lambda$computeTrivialOperationsOnConstString$11(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):237:237 -> b
+    9:9:java.lang.Integer lambda$computeTrivialOperationsOnConstString$15(com.android.tools.r8.graph.DexString,java.lang.Integer):245:245 -> b
+    10:15:void logNameComputation(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):470:475 -> b
+    16:16:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):517:517 -> b
+    17:17:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> b
+    17:17:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):518 -> b
+    18:38:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):519:539 -> b
+    39:82:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):537:580 -> b
     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
-    2:2:java.lang.Integer lambda$computeTrivialOperationsOnConstString$12(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):221:221 -> c
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$14(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):225:225 -> d
-    2:8:void logHistogramOfNames(com.android.tools.r8.graph.DexString):462:468 -> d
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$16(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):229:229 -> e
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$17(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):231:231 -> f
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$18(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):233:233 -> g
-    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.M0.h:
+    83:83:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):580 -> b
+    84:84:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):580:580 -> b
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$6(com.android.tools.r8.graph.DexString):227:227 -> c
+    2:2:java.lang.Integer lambda$computeTrivialOperationsOnConstString$12(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):239:239 -> c
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$14(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):243:243 -> d
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$16(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):247:247 -> e
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$17(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):249:249 -> f
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$18(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):251:251 -> g
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$7(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):229:229 -> h
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):231:231 -> i
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$9(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):233:233 -> j
+com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.D.e.L0.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>
-    1:1:com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration getInstance():575:575 -> a
-    2:17:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):584:599 -> a
-    18:18:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    18:18:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):599 -> a
-    19:19:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):600:600 -> a
-    20:20:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    20:20:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):599 -> a
-    21:22:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):602:603 -> a
-    23:23:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    23:23:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):603 -> a
-    24:24:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):604:604 -> a
-    25:25:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
-    25:25:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):603 -> a
+    1:1:void <clinit>():587:587 -> <clinit>
+    1:1:void <init>():590:590 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration getInstance():593:593 -> a
+    2:17:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):602:617 -> a
+    18:18:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    18:18:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):617 -> a
+    19:19:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):618:618 -> a
+    20:20:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    20:20:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):617 -> a
+    21:22:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):620:621 -> a
+    23:23:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    23:23:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):621 -> a
+    24:24:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):622:622 -> a
+    25:25:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    25:25:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):621 -> a
 com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator -> com.android.tools.r8.D.f.c:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.List moveExceptionIntervals -> o
@@ -40293,7 +40702,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():1478:1478 -> a
+    124:124:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
     124:124:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):491 -> a
     124:124:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
     125:125:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):491:491 -> a
@@ -40582,16 +40991,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():330:330 -> a
+    1399:1399:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     1399:1399:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2651 -> a
     1399:1399:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2479 -> a
     1400:1406:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2479:2485 -> a
     1407:1458:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2518:2569 -> a
     1459:1465:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2566:2572 -> a
-    1466:1466:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    1466:1466:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     1466:1466:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2572 -> a
     1467:1474:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2572:2579 -> a
-    1475:1475:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    1475:1475:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     1475:1475:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2651 -> a
     1475:1475:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2579 -> a
     1476:1513:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2579:2616 -> a
@@ -40603,7 +41012,7 @@
     1558:1562:boolean argumentsAreAlreadyLinked(com.android.tools.r8.ir.code.Invoke):2869:2873 -> a
     1558:1562:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2764 -> a
     1563:1596:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2765:2798 -> a
-    1597:1598:boolean com.android.tools.r8.ir.code.Value.hasRegisterConstraint():746:747 -> a
+    1597:1598:boolean com.android.tools.r8.ir.code.Value.hasRegisterConstraint():750:751 -> a
     1597:1598:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2800 -> a
     1599:1599:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2801:2801 -> a
     1600:1601:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):2749:2750 -> a
@@ -40698,7 +41107,7 @@
     97:97:void computeLiveRanges():2495 -> c
     97:97:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> c
     97:97:void allocateRegisters():213 -> c
-    98:98:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():1156:1156 -> c
+    98:98:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():1158:1158 -> c
     98:98:void computeLiveRanges():2495 -> c
     98:98:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> c
     98:98:void allocateRegisters():213 -> c
@@ -40706,7 +41115,7 @@
     99:99:void computeLiveRanges():2495 -> c
     99:99:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> c
     99:99:void allocateRegisters():213 -> c
-    100:100:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():1165:1165 -> c
+    100:100:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():1167:1167 -> c
     100:100:void computeLiveRanges():2495 -> c
     100:100:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> c
     100:100:void allocateRegisters():213 -> c
@@ -40719,17 +41128,17 @@
     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():879:879 -> c
+    122:122:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> c
     122:122:void allocateRegisters():227 -> c
     123:127:void allocateRegisters():228:232 -> c
-    128:128:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> c
+    128:128:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> c
     128:128:void allocateRegisters():227 -> c
     129:129:void allocateRegisters():236:236 -> c
     130:135:void clearState():531:536 -> c
     130:135:void allocateRegisters():237 -> c
     136:136:com.android.tools.r8.utils.InternalOptions options():624:624 -> c
     136:136:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1499 -> c
-    137:137:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():1171:1171 -> c
+    137:137:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():1173:1173 -> c
     137:137:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1499 -> c
     138:158:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1502:1522 -> c
     159:171:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1535:1547 -> c
@@ -40738,11 +41147,11 @@
     1:1:int highestUsedRegister():583:583 -> d
     2:2:com.android.tools.r8.utils.InternalOptions options():624:624 -> d
     2:2:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1204:1204 -> d
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1206:1206 -> d
     3:3:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
     4:4:com.android.tools.r8.utils.InternalOptions options():624:624 -> d
     4:4:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1378:1378 -> d
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1380:1380 -> d
     5:5:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
     6:24:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1459 -> d
     25:25:boolean com.android.tools.r8.ir.code.NumberConversion.isLongToIntConversion():52:52 -> d
@@ -40751,13 +41160,13 @@
     27:27:com.android.tools.r8.utils.InternalOptions options():624:624 -> d
     27:27:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
     27:27:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
-    28:28:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1204:1204 -> d
+    28:28:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1206:1206 -> d
     28:28:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
     28:28:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
     29:29:com.android.tools.r8.utils.InternalOptions options():624:624 -> d
     29:29:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
     29:29:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
-    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1378:1378 -> d
+    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1380:1380 -> d
     30:30:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
     30:30:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
     31:49:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1459 -> d
@@ -41159,7 +41568,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():1478:1478 -> a
+    57:57:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> 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
@@ -41180,7 +41589,7 @@
     86:90:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):316:320 -> a
     91:99:void removeArgumentRestores(java.util.Set):332:340 -> a
     100:124:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):347:371 -> a
-    125:125:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():1140:1140 -> a
+    125:125:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():1142:1142 -> a
     125:125:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):371 -> a
     126:131:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):371:376 -> a
     132:136:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):375:379 -> a
@@ -41214,53 +41623,70 @@
 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.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
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):41:41 -> <init>
+    1:1:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexString):46:46 -> a
     2:2:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType):30:30 -> a
-    2:2:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.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
+    2:2:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexString):46 -> a
+    3:9:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexString):49:55 -> a
 com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.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
+    1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):293:294 -> <init>
+    1:9:com.android.tools.r8.graph.CfCode generateCfCode():299:307 -> a
+    10:10:com.android.tools.r8.graph.CfCode generateCfCode():305:305 -> a
+    11:23:com.android.tools.r8.graph.CfCode generateCfCode():302:314 -> a
 com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterThrowRuntimeExceptionCfCodeProvider -> com.android.tools.r8.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
+    1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):324:325 -> <init>
+    1:11:com.android.tools.r8.graph.CfCode generateCfCode():330:340 -> a
+    12:12:com.android.tools.r8.graph.CfCode generateCfCode():338:338 -> a
+    13:22:com.android.tools.r8.graph.CfCode generateCfCode():335:344 -> a
 com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.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
+    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):83:87 -> <init>
+    1:14:com.android.tools.r8.graph.CfCode generateCfCode():92:105 -> a
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):66:66 -> a
+    15:15:com.android.tools.r8.graph.CfCode generateCfCode():108 -> a
+    16:16:com.android.tools.r8.graph.CfCode generateCfCode():108:108 -> a
+    17:17:com.android.tools.r8.graph.CfCode generateCfCode():105:105 -> a
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):66:66 -> a
+    18:18:com.android.tools.r8.graph.CfCode generateCfCode():110 -> a
+    19:30:com.android.tools.r8.graph.CfCode generateCfCode():110:121 -> a
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):66:66 -> a
+    31:31:com.android.tools.r8.graph.CfCode generateCfCode():122 -> a
+    32:43:com.android.tools.r8.graph.CfCode generateCfCode():125:136 -> a
+    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):66:66 -> a
+    44:44:com.android.tools.r8.graph.CfCode generateCfCode():140 -> a
+    45:45:com.android.tools.r8.graph.CfCode generateCfCode():139:139 -> a
+    46:58:com.android.tools.r8.graph.CfCode generateCfCode():136:148 -> a
 com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.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
+    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):167:171 -> <init>
+    1:17:com.android.tools.r8.graph.CfCode generateCfCode():176:192 -> a
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):66:66 -> a
+    18:18:com.android.tools.r8.graph.CfCode generateCfCode():195 -> a
+    19:19:com.android.tools.r8.graph.CfCode generateCfCode():195:195 -> a
+    20:40:com.android.tools.r8.graph.CfCode generateCfCode():192:212 -> a
+    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):66:66 -> a
+    41:41:com.android.tools.r8.graph.CfCode generateCfCode():216 -> a
+    42:42:com.android.tools.r8.graph.CfCode generateCfCode():215:215 -> a
+    43:43:com.android.tools.r8.graph.CfCode generateCfCode():212:212 -> a
+    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):66:66 -> a
+    44:44:com.android.tools.r8.graph.CfCode generateCfCode():218 -> a
+    45:50:com.android.tools.r8.graph.CfCode generateCfCode():220:225 -> a
 com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperConversionCfCodeProvider -> com.android.tools.r8.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
+    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):237:240 -> <init>
+    1:36:com.android.tools.r8.graph.CfCode generateCfCode():245:280 -> a
+    37:37:com.android.tools.r8.graph.CfCode generateCfCode():278:278 -> a
+    38:47:com.android.tools.r8.graph.CfCode generateCfCode():275:284 -> a
 com.android.tools.r8.ir.synthetic.EmulateInterfaceSyntheticCfCodeProvider -> com.android.tools.r8.D.g.i:
     java.util.List extraDispatchCases -> f
     com.android.tools.r8.graph.DexType interfaceType -> c
@@ -46283,7 +46709,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():309:309 -> a
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     27:27:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):116 -> a
     28:28:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):119:119 -> a
     29:40:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):117:128 -> a
@@ -46302,7 +46728,7 @@
     123:127:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):195 -> a
     128:128:void lambda$writeClass$0(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):196:196 -> a
     129:132:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):200:203 -> a
-    133:133:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    133:133:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     133:133:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):204 -> a
     134:138:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):203:207 -> a
     139:146:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):222:229 -> a
@@ -46385,12 +46811,17 @@
     java.lang.Object _value -> b
     java.lang.Object lock -> c
     1:5:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0,java.lang.Object):55:59 -> <init>
-    1:14:java.lang.Object getValue():63:76 -> a
-    15:20:java.lang.Object getValue():69:74 -> a
-    21:21:java.lang.Object getValue():69:69 -> a
     1:1:boolean isInitialized():82:82 -> toString
     1:1:java.lang.String toString():84 -> toString
-    2:2:java.lang.String toString():84:84 -> toString
+    2:15:java.lang.Object getValue():63:76 -> toString
+    2:15:java.lang.String toString():84 -> toString
+    16:16:java.lang.Object getValue():69:69 -> toString
+    16:16:java.lang.String toString():84 -> toString
+    17:17:java.lang.String toString():84:84 -> toString
+    18:18:java.lang.Object getValue():74:74 -> toString
+    18:18:java.lang.String toString():84 -> toString
+    19:19:java.lang.Object getValue():69:69 -> toString
+    19:19:java.lang.String toString():84 -> toString
 com.android.tools.r8.jetbrains.kotlin.TypeCastException -> com.android.tools.r8.G.a.j:
     1:1:void <init>(java.lang.String):11:11 -> <init>
 com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE -> com.android.tools.r8.G.a.k:
@@ -50926,17 +51357,19 @@
     1:1:void <clinit>():765:765 -> <clinit>
     1:7:void <init>(int):783:789 -> <init>
     8:8:void <init>(int):785:785 -> <init>
-    1:1:int size():872:872 -> a
-    2:10:void flushFullBuffer(int):898:906 -> a
-    1:1:void flushLastBuffer():914:914 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> b
-    2:3:byte[] copyArray(byte[],int):835:836 -> b
-    2:3:void flushLastBuffer():916 -> b
-    2:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> b
-    4:18:void flushLastBuffer():917:931 -> b
-    4:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> b
-    19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():828:828 -> b
+    1:9:void flushFullBuffer(int):898:906 -> a
+    10:10:void flushLastBuffer():914:914 -> a
+    10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> a
+    11:12:byte[] copyArray(byte[],int):835:836 -> a
+    11:12:void flushLastBuffer():916 -> a
+    11:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> a
+    13:27:void flushLastBuffer():917:931 -> a
+    13:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> a
+    28:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():828:828 -> a
     1:1:java.lang.String toString():888:888 -> toString
+    2:2:int size():872:872 -> toString
+    2:2:java.lang.String toString():888 -> toString
+    3:3:java.lang.String toString():888:888 -> toString
     1:4:void write(int):794:797 -> write
     5:19:void write(byte[],int,int):802:816 -> write
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream -> com.android.tools.r8.G.b.a.b.b.l:
@@ -52342,7 +52775,7 @@
     9:26:void <init>(com.android.tools.r8.kotlin.Kotlin):60:77 -> <init>
     27:27:void <init>(com.android.tools.r8.kotlin.Kotlin):75:75 -> <init>
     1:1:com.android.tools.r8.graph.DexType lambda$new$0(java.lang.Integer):62:62 -> a
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     2:2:com.android.tools.r8.graph.DexType lambda$new$0(java.lang.Integer):62 -> a
     3:3:int getArity(com.android.tools.r8.graph.DexType):85:85 -> a
     4:4:boolean isFunctionInterface(com.android.tools.r8.graph.DexType):81:81 -> a
@@ -53048,28 +53481,37 @@
     217:217:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):312 -> a
     218:221:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):315:318 -> a
     222:225:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):209:212 -> a
-    226:241:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):337:352 -> a
-    226:241:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    242:242:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):351:351 -> a
-    242:242:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    243:268:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):217:242 -> a
-    269:269: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
-    269:269:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):242 -> a
-    270:284:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):245:259 -> a
-    285:285:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
-    285:285:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):259 -> a
-    286:286:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
-    286:286:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):260 -> a
-    287:289:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):262:264 -> a
-    290:290:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
-    290:290:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):264 -> a
-    291:349:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):267:325 -> a
-    350:356:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):324:330 -> a
-    357:357: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
-    357:357:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):329 -> a
-    358:361:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):328:331 -> a
-    362:362:com.android.tools.r8.ir.code.Value lambda$decoupleIdentifierNameStringForInvokeInstruction$2(com.android.tools.r8.ir.code.Value[],com.android.tools.r8.ir.code.Value,long):326:326 -> a
-    363:392:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):361:390 -> a
+    226:227:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):337:338 -> a
+    226:227:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
+    228:229:boolean com.android.tools.r8.naming.IdentifierNameStringUtils.isClassNameComparison(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):147:148 -> a
+    228:229:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):338 -> a
+    228:229:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
+    230:243:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):339:352 -> a
+    230:243:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
+    244:244:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):351:351 -> a
+    244:244:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
+    245:264:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):217:236 -> a
+    265:267:java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate):18:20 -> a
+    265:267:java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate):0 -> a
+    265:267:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):236 -> a
+    268:273:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):237:242 -> a
+    274:274:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> a
+    274:274:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):242 -> a
+    275:289:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):245:259 -> a
+    290:290:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    290:290:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):259 -> a
+    291:291:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    291:291:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):260 -> a
+    292:294:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):262:264 -> a
+    295:295:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    295:295:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):264 -> a
+    296:354:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):267:325 -> a
+    355:361:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):324:330 -> a
+    362:362:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):66:66 -> a
+    362:362:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):329 -> a
+    363:366:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):328:331 -> a
+    367:367:com.android.tools.r8.ir.code.Value lambda$decoupleIdentifierNameStringForInvokeInstruction$2(com.android.tools.r8.ir.code.Value[],com.android.tools.r8.ir.code.Value,long):326:326 -> a
+    368:397:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):361:390 -> a
 com.android.tools.r8.naming.IdentifierNameStringUtils -> com.android.tools.r8.K.D:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():35:35 -> <clinit>
@@ -53082,12 +53524,12 @@
     92:93:boolean isClassNameComparison(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):147:148 -> a
     94:96:boolean isClassNameComparison(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexItemFactory):152:154 -> a
     97:112:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):176:191 -> a
-    113:113:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    113:113:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     113:113:com.android.tools.r8.graph.DexType inferTypeFromConstStringValue(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.Value):283 -> a
     113:113:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):190 -> a
     114:122:com.android.tools.r8.graph.DexType inferTypeFromConstStringValue(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.Value):284:292 -> a
     114:122:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):190 -> a
-    123:123:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    123:123:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     123:123:com.android.tools.r8.graph.DexType inferTypeFromConstStringValue(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.Value):283 -> a
     123:123:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):190 -> a
     124:163:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):197:236 -> a
@@ -53103,19 +53545,19 @@
     212:215:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):240 -> a
     216:218:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):242:244 -> a
     219:221:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):250:252 -> a
-    222:222:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    222:222:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     222:222:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):252 -> a
     223:223:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):253:253 -> a
-    224:224:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    224:224:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     224:224:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):252 -> a
-    225:225:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    225:225:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     225:225:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):158 -> a
     226:228:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):159:161 -> a
-    229:229:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():253:253 -> a
+    229:229:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     229:229:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):158 -> a
     230:257:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):300:327 -> a
     230:257:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):264 -> a
-    258:258:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    258:258:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     258:258:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):327 -> a
     258:258:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):264 -> a
     259:263:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):328:332 -> a
@@ -53135,7 +53577,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):1220:1220 -> b
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
     4:4:com.android.tools.r8.graph.DexType inferTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):276 -> b
 com.android.tools.r8.naming.InterfaceMethodNameMinifier -> com.android.tools.r8.K.G:
     com.android.tools.r8.naming.MethodNameMinifier$State minifierState -> d
@@ -53154,10 +53596,10 @@
     3:5:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):406:408 -> a
     6:8:void reserveNamesInInterfaces(java.util.Collection):396:398 -> a
     6:8:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):409 -> a
-    9:10:void com.android.tools.r8.naming.MethodNameMinifier$State.allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):105:106 -> a
+    9:10:void com.android.tools.r8.naming.MethodNameMinifier$State.allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):106:107 -> a
     9:10:void reserveNamesInInterfaces(java.util.Collection):398 -> a
     9:10:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):409 -> a
-    11:11:void com.android.tools.r8.naming.MethodNameMinifier$State.allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):105:105 -> a
+    11:11:void com.android.tools.r8.naming.MethodNameMinifier$State.allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):106:106 -> a
     11:11:void reserveNamesInInterfaces(java.util.Collection):398 -> a
     11:11:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):409 -> a
     12:14:void reserveNamesInInterfaces(java.util.Collection):399:401 -> a
@@ -53167,7 +53609,7 @@
     20:25:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):413:418 -> a
     26:32:void computeReservationFrontiersForAllImplementingClasses():583:589 -> a
     26:32:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):419 -> a
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.MethodNameMinifier$State.getFrontier(com.android.tools.r8.graph.DexType):110:110 -> a
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.MethodNameMinifier$State.getFrontier(com.android.tools.r8.graph.DexType):111:111 -> a
     33:33:void computeReservationFrontiersForAllImplementingClasses():589 -> a
     33:33:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):419 -> a
     34:35:void computeReservationFrontiersForAllImplementingClasses():590:591 -> a
@@ -53189,7 +53631,7 @@
     215:215:com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState lambda$assignNamesToInterfaceMethods$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):426:426 -> a
     216:236:void lambda$assignNamesToInterfaceMethods$1(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):448:468 -> a
     237:240:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):559:562 -> a
-    241:241:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):101:101 -> a
+    241:241:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):102:102 -> a
     241:241:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):562 -> a
     242:245:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):564:567 -> a
     246:246:boolean lambda$assignNewName$2(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):566:566 -> a
@@ -53210,7 +53652,7 @@
     29:30:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):305:306 -> a
     31:31:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State):314:314 -> a
     32:32:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):316:316 -> a
-    33:33:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):93:93 -> a
+    33:33:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):94:94 -> a
     33:33:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):317 -> a
     34:34:void forEachState(java.util.function.BiConsumer):322:322 -> a
     35:35:java.lang.Object lambda$forEachState$5(java.util.function.BiConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):324:324 -> a
@@ -53222,10 +53664,10 @@
     2:2:java.util.Set lambda$appendMethodGroupState$1(com.android.tools.r8.graph.DexMethod):252:252 -> b
     3:3:void reserveName(com.android.tools.r8.graph.DexString):288:288 -> b
     4:7:void lambda$reserveName$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):290:293 -> b
-    8:8:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):93:93 -> b
+    8:8:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):94:94 -> b
     8:8:void lambda$reserveName$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):293 -> b
     9:10:void lambda$reserveName$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):295:296 -> b
-    11:11:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):93:93 -> b
+    11:11:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):94:94 -> b
     11:11:void lambda$reserveName$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):296 -> b
     1:1:java.util.Map access$400(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):240:240 -> c
     1:1:int compareTo(java.lang.Object):240:240 -> compareTo
@@ -53241,14 +53683,14 @@
     1:1:void <init>(com.android.tools.r8.naming.InterfaceMethodNameMinifier,com.android.tools.r8.graph.DexClass):108:108 -> <init>
     2:7:void <init>(com.android.tools.r8.naming.InterfaceMethodNameMinifier,com.android.tools.r8.graph.DexClass):104:109 -> <init>
     1:4:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexMethod):115:118 -> a
-    5:5:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.MethodNameMinifier$State.getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):114:114 -> a
+    5:5:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.MethodNameMinifier$State.getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):115:115 -> a
     5:5:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexMethod):118 -> a
     6:21:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexMethod):126:141 -> a
     22:29:java.lang.Boolean lambda$getReservedName$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):129:136 -> a
     30:30:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):171:171 -> a
     31:31:void lambda$addRenaming$5(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):173:173 -> a
     32:32:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):175:175 -> a
-    33:33:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):101:101 -> a
+    33:33:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):102:102 -> a
     33:33:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):175 -> a
     34:35:void com.android.tools.r8.naming.MethodNamingState.addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):70:71 -> a
     34:35:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):176 -> a
@@ -53256,12 +53698,12 @@
     37:37:java.lang.Object lambda$forAll$6(java.util.function.Consumer,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):184:184 -> a
     38:46:java.lang.Object forAny(java.util.function.Function):190:198 -> a
     1:1:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):149:149 -> b
-    2:2:com.android.tools.r8.naming.MethodReservationState com.android.tools.r8.naming.MethodNameMinifier$State.getReservationState(com.android.tools.r8.graph.DexType):97:97 -> b
+    2:2:com.android.tools.r8.naming.MethodReservationState com.android.tools.r8.naming.MethodNameMinifier$State.getReservationState(com.android.tools.r8.graph.DexType):98:98 -> b
     2:2:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):149 -> b
     3:3:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):150:150 -> b
     4:15:boolean isAvailable(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):156:167 -> b
     16:17:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):159:160 -> b
-    18:18:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):101:101 -> b
+    18:18:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):102:102 -> b
     18:18:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):160 -> b
     19:20:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):161:162 -> b
     21:28:java.lang.Object forChildren(java.util.function.Function):219:226 -> b
@@ -53300,10 +53742,10 @@
     8:8:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod,boolean):235 -> a
     9:10:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod,boolean):235:236 -> a
     11:13:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):270:272 -> a
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     14:14:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):272 -> a
     15:17:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):272:274 -> a
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     18:18:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):274 -> a
     19:20:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):277:278 -> a
     21:21:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):275:275 -> a
@@ -53342,58 +53784,59 @@
     com.android.tools.r8.com.google.common.collect.BiMap reservationStates -> e
     java.util.Map namingStates -> f
     java.util.Map frontiers -> g
-    1:1:void <clinit>():86:86 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):134:134 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):121:140 -> <init>
-    1:1:java.util.Map access$000(com.android.tools.r8.naming.MethodNameMinifier):86:86 -> a
-    2:2:com.android.tools.r8.naming.MethodNamingState access$200(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType):86:86 -> a
-    3:3:com.android.tools.r8.naming.MethodReservationState access$400(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):86:86 -> a
-    4:9:java.util.function.Function getKeyTransform():144:149 -> a
-    10:10:java.lang.Object lambda$getKeyTransform$0(com.android.tools.r8.graph.DexMethod):146:146 -> a
-    11:11:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):173:173 -> a
-    12:14:void reserveNamesInClasses():247:249 -> a
-    12:14:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):174 -> a
-    15:15:void reserveNamesInClasses():247:247 -> a
-    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
+    1:1:void <clinit>():87:87 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):135:135 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):122:141 -> <init>
+    1:1:java.util.Map access$000(com.android.tools.r8.naming.MethodNameMinifier):87:87 -> a
+    2:2:com.android.tools.r8.naming.MethodNamingState access$200(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType):87:87 -> a
+    3:3:com.android.tools.r8.naming.MethodReservationState access$400(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):87:87 -> a
+    4:9:java.util.function.Function getKeyTransform():145:150 -> a
+    10:10:java.lang.Object lambda$getKeyTransform$0(com.android.tools.r8.graph.DexMethod):147:147 -> a
+    11:11:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):174:174 -> a
+    12:14:void reserveNamesInClasses():248:250 -> a
+    12:14:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):175 -> a
+    15:15:void reserveNamesInClasses():248:248 -> a
+    15:15:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):175 -> a
+    16:32:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):176:192 -> a
+    33:35:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):196:198 -> 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
-    64:78:void assignNameToMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState):228:242 -> a
+    36:36:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):198 -> a
+    37:62:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):198:223 -> 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):201:201 -> a
+    64:78:void assignNameToMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState):229:243 -> a
     79:80:void com.android.tools.r8.naming.MethodNamingState.addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):70:71 -> a
-    79:80:void assignNameToMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState):242 -> a
-    81:90:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):274:283 -> a
+    79:80:void assignNameToMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState):243 -> a
+    81:90:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):275:284 -> a
     91:91:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    91:91:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):285 -> a
-    92:92: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:285 -> a
-    93:93:java.lang.Iterable shuffleMethods(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):322:322 -> a
-    93:93: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 -> a
-    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():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
-    2:2:java.lang.Object lambda$getKeyTransform$1(com.android.tools.r8.graph.DexMethod):149:149 -> b
-    3:15:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):255:267 -> b
-    16:16:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):265:265 -> b
-    1:1:com.android.tools.r8.naming.MethodReservationState access$300(com.android.tools.r8.naming.MethodNameMinifier):86:86 -> c
-    1:1:java.util.Map access$500(com.android.tools.r8.naming.MethodNameMinifier):86:86 -> d
-    1:1:com.android.tools.r8.naming.MemberNamingStrategy access$600(com.android.tools.r8.naming.MethodNameMinifier):86:86 -> e
+    91:91:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):286 -> a
+    92:92:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):286:286 -> a
+    93:93:java.lang.Iterable shuffleMethods(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):331:331 -> a
+    93:93:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):286 -> a
+    94:103:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):286:295 -> a
+    104:104:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):293:293 -> a
+    105:105:com.android.tools.r8.naming.MethodReservationState lambda$allocateReservationStateAndReserve$3(com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):282:282 -> a
+    106:120:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):306:320 -> a
+    121:121:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    121:121:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):320 -> a
+    122:124:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):320:322 -> a
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap access$100(com.android.tools.r8.naming.MethodNameMinifier):87:87 -> b
+    2:2:java.lang.Object lambda$getKeyTransform$1(com.android.tools.r8.graph.DexMethod):150:150 -> b
+    3:15:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):256:268 -> b
+    16:16:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):266:266 -> b
+    1:1:com.android.tools.r8.naming.MethodReservationState access$300(com.android.tools.r8.naming.MethodNameMinifier):87:87 -> c
+    1:1:java.util.Map access$500(com.android.tools.r8.naming.MethodNameMinifier):87:87 -> d
+    1:1:com.android.tools.r8.naming.MemberNamingStrategy access$600(com.android.tools.r8.naming.MethodNameMinifier):87:87 -> e
 com.android.tools.r8.naming.MethodNameMinifier$1 -> com.android.tools.r8.K.O:
 com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming -> com.android.tools.r8.K.P:
     java.util.Map renaming -> a
     java.util.Map callSiteRenaming -> b
-    1:1:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.naming.MethodNameMinifier$1):153:153 -> <init>
-    2:4:void <init>(java.util.Map,java.util.Map):159:161 -> <init>
-    1:1:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming empty():165:165 -> a
+    1:1:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.naming.MethodNameMinifier$1):154:154 -> <init>
+    2:4:void <init>(java.util.Map,java.util.Map):160:162 -> <init>
+    1:1:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming empty():166:166 -> a
 com.android.tools.r8.naming.MethodNameMinifier$State -> com.android.tools.r8.K.Q:
     com.android.tools.r8.naming.MethodNameMinifier this$0 -> a
-    1:1:void <init>(com.android.tools.r8.naming.MethodNameMinifier):90:90 -> <init>
-    1:1:com.android.tools.r8.naming.MethodReservationState getReservationState(com.android.tools.r8.graph.DexType):97:97 -> a
+    1:1:void <init>(com.android.tools.r8.naming.MethodNameMinifier):91:91 -> <init>
+    1:1:com.android.tools.r8.naming.MethodReservationState getReservationState(com.android.tools.r8.graph.DexType):98:98 -> a
 com.android.tools.r8.naming.MethodNamingState -> com.android.tools.r8.K.V:
     com.android.tools.r8.naming.MethodNamingState parentNamingState -> d
     boolean $assertionsDisabled -> f
@@ -53703,7 +54146,7 @@
     30:31:java.lang.String lookupPackageName(java.lang.String):125 -> a
     32:32:java.lang.String lookupPackageName(java.lang.String):126:126 -> a
     33:33:void forAllRenamedTypes(java.util.function.Consumer):142:142 -> a
-    34:34:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    34:34:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     34:34:void forAllRenamedTypes(java.util.function.Consumer):142 -> a
     35:37:void forAllRenamedTypes(java.util.function.Consumer):143:145 -> a
     38:51:java.util.Map getRenamedItems(java.lang.Class,java.util.function.Predicate,java.util.function.Function):152:165 -> a
@@ -53743,7 +54186,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):1220:1220 -> a
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     19:19:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.MemberNaming$FieldSignature.toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):163 -> a
     19:19:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):282 -> a
     20:21:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.MemberNaming$FieldSignature.toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):163:164 -> a
@@ -53753,7 +54196,7 @@
     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):558:558 -> a
+    48:48:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> a
     48:48:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):108 -> a
     49:52:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):116:119 -> a
     53:63:void computeDefaultInterfaceMethodMethods():318:328 -> a
@@ -53801,10 +54244,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):558:558 -> a
+    227:227:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> a
     227:227:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):241 -> a
     228:231:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):242:245 -> a
-    232:232:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):558:558 -> a
+    232:232:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> a
     232:232:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):246 -> a
     233:233:void lambda$computeMapping$4(java.util.Deque,com.android.tools.r8.graph.DexType):241:241 -> a
     234:243:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):252:261 -> a
@@ -54344,7 +54787,7 @@
     4:9:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
     10:10:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):190:190 -> a
     10:10:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     11:11:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):189 -> a
     11:11:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
     12:14:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):194:196 -> a
@@ -54358,7 +54801,7 @@
     43:43:void parsedIdentifier(java.lang.String):167:167 -> a
     1:1:com.android.tools.r8.graph.DexType parsedTypeName(java.lang.String):172:172 -> b
     1:1:java.lang.Object parsedTypeName(java.lang.String):153 -> b
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> b
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
     2:2:com.android.tools.r8.graph.DexType parsedTypeName(java.lang.String):172 -> b
     2:2:java.lang.Object parsedTypeName(java.lang.String):153 -> b
     3:8:com.android.tools.r8.graph.DexType parsedTypeName(java.lang.String):173:178 -> b
@@ -54376,7 +54819,7 @@
     2:12:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):57 -> a
     13:37:void publicizeType(com.android.tools.r8.graph.DexType):77:101 -> a
     38:44:void publicizeType(com.android.tools.r8.graph.DexType):99:105 -> a
-    45:45:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):558:558 -> a
+    45:45:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> a
     45:45:void publicizeType(com.android.tools.r8.graph.DexType):105 -> a
     46:46:void lambda$publicizeType$0(com.android.tools.r8.graph.DexEncodedField):82:82 -> a
     47:91:boolean publicizeMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):109:153 -> a
@@ -54429,7 +54872,7 @@
     39:53:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):125:139 -> a
     54:54:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):169:169 -> a
     54:54:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):145 -> a
-    55:55:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    55:55:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     55:55:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):169 -> a
     55:55:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):145 -> a
     56:59:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):169:172 -> a
@@ -56415,7 +56858,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):558:558 -> a
+    44:44:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> a
     44:44:void processClass(com.android.tools.r8.graph.DexType):46 -> a
     45:45:void processClass(com.android.tools.r8.graph.DexType):47:47 -> a
 com.android.tools.r8.shaking.AnnotationRemover -> com.android.tools.r8.N.b:
@@ -56582,27 +57025,29 @@
     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
+    84:85:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1033 -> a
+    86:86:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1033:1033 -> a
     87:106:boolean isMethodPinnedDirectlyOrInAncestor(com.android.tools.r8.graph.DexMethod):797:816 -> a
-    87:106:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):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
+    87:106:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1033 -> a
+    107:145:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1034:1072 -> a
     146:147:boolean isPinned(com.android.tools.r8.graph.DexReference):791:792 -> a
     148:149:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):836:837 -> a
     150:151:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLense(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):842:843 -> a
     152:167:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):862:877 -> a
     168:168:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):875:875 -> a
     169:169:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):873:873 -> a
-    170:171:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1078:1079 -> a
+    170:171:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1105:1106 -> a
     170:171:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):871 -> a
-    172:173:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):885:886 -> a
+    172:173:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):910:911 -> a
     172:173:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):869 -> a
-    174: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):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
+    174:177:boolean isInvalidSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):902:905 -> a
+    178:187:boolean interfacesMayHaveDefaultFor(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexMethod):1088:1097 -> a
+    188:209:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1114:1135 -> a
+    210:242:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1134:1166 -> a
+    243:243:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    243:243:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1165 -> a
+    244:270:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1167:1193 -> a
+    271:273:com.android.tools.r8.shaking.AppInfoWithLiveness addEnumValueInfoMaps(java.util.Map):1204:1206 -> a
     1:1:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):538:538 -> b
     2:6:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):593:597 -> b
     7:7:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):351:351 -> b
@@ -56614,28 +57059,31 @@
     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
+    29:37:com.android.tools.r8.graph.DexEncodedMethod validateSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):885:893 -> b
+    38:56:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):919:937 -> b
+    57:112:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):936:991 -> b
+    113:119:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):987:993 -> b
+    120:129:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):986:995 -> b
+    130:130:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):973:973 -> b
+    131:138:com.android.tools.r8.graph.DexEncodedMethod nestAccessLookup(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1000:1007 -> b
+    139:141:com.android.tools.r8.shaking.AppInfoWithLiveness addSwitchMaps(java.util.Map):1197:1199 -> b
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMapFor(com.android.tools.r8.graph.DexField):628:629 -> c
     3:14:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):707:718 -> c
     1:2:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):732:733 -> d
-    3:3:java.lang.String com.android.tools.r8.graph.DexEncodedField.toSourceString():90:90 -> d
+    3:3:java.lang.String com.android.tools.r8.graph.DexEncodedField.toSourceString():89:89 -> d
     3:3:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):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:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():786:786 -> m
     1:2:java.util.Map getEnumValueInfoMapFor(com.android.tools.r8.graph.DexType):623:624 -> q
-    3:4:java.util.Set getPrunedTypes():856:857 -> q
+    3:3:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():634:634 -> q
     1:2:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):682:683 -> r
     3:8:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexType):655:660 -> r
     3:8:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):684 -> r
     9:9:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):684:684 -> r
+    10:11:java.util.Set getPrunedTypes():856:857 -> r
     1:15:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexType):664:678 -> s
     1:2:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):542:543 -> t
     3:3:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):538:538 -> t
@@ -56724,882 +57172,803 @@
     9:11:void lambda$run$0(java.util.List,com.android.tools.r8.graph.DexEncodedMethod):30 -> a
     12:14:void checkItem(com.android.tools.r8.graph.DexDefinition,java.util.List):37:39 -> a
     12:14:void lambda$run$1(java.util.List,com.android.tools.r8.graph.DexEncodedField):31 -> a
-com.android.tools.r8.shaking.Enqueuer -> com.android.tools.r8.N.C:
-    com.android.tools.r8.shaking.Enqueuer$SetWithReason instantiatedInterfaceTypes -> P
-    java.util.Map annotationNodes -> s
-    boolean $assertionsDisabled -> b0
-    com.android.tools.r8.shaking.Enqueuer$SetWithReason targetedMethods -> H
-    java.util.Map deferredAnnotations -> V
-    java.util.Map ruleNodes -> w
-    java.util.Map reachableInstanceFields -> B
-    java.util.Set methodsTargetedByInvokeDynamic -> J
+com.android.tools.r8.shaking.Enqueuer -> com.android.tools.r8.N.A:
+    java.util.Map scopedMethodsForLiveTypes -> R
+    java.util.Map staticInvokes -> m
+    java.util.Set brokenSuperInvokes -> s
+    com.android.tools.r8.shaking.EnqueuerWorklist workList -> K
+    com.android.tools.r8.graph.AppView appView -> e
+    java.util.Map deferredAnnotations -> P
+    com.android.tools.r8.shaking.Enqueuer$SetWithReason liveFields -> H
+    java.util.Set directAndIndirectlyInstantiatedTypes -> A
+    com.android.tools.r8.shaking.Enqueuer$SetWithReason instantiatedInterfaceTypes -> J
+    java.util.Map superInvokeDependencies -> u
+    boolean $assertionsDisabled -> T
     java.util.Set analyses -> c
-    com.android.tools.r8.shaking.Enqueuer$SetWithReason liveTypes -> C
+    com.android.tools.r8.shaking.ProguardClassFilter dontWarnPatterns -> h
+    java.util.Set methodsTargetedByInvokeDynamic -> D
+    com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason liveTypes -> w
+    java.util.Set virtualMethodsTargetedByInvokeDirect -> F
+    java.util.Map virtualInvokes -> i
     java.util.Set instanceFieldsWrittenOutsideEnclosingInstanceInitializers -> o
     java.util.Map superInvokes -> k
-    java.util.Set pendingReflectiveUses -> R
-    java.util.Map virtualTargetsMarkedAsReachable -> S
-    java.util.Map classNodes -> t
+    java.util.Set callSites -> q
+    com.android.tools.r8.shaking.Enqueuer$SetWithReason liveAnnotations -> y
+    com.android.tools.r8.shaking.GraphReporter graphReporter -> S
+    java.util.Set pendingReflectiveUses -> L
+    java.util.Set reportedMissing -> N
+    java.util.Map activeIfRules -> Q
+    java.util.Set liveNonProgramTypes -> x
+    java.util.Map reachableVirtualMethods -> t
+    java.util.Map virtualTargetsMarkedAsReachable -> M
+    com.android.tools.r8.shaking.Enqueuer$SetWithReason liveMethods -> G
+    com.android.tools.r8.utils.InternalOptions options -> f
+    java.util.Map reachableInstanceFields -> v
     com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet -> g
-    java.util.Map activeIfRules -> W
-    java.util.Map reasonInfo -> x
-    com.android.tools.r8.shaking.Enqueuer$SetWithReason liveMethods -> M
-    java.util.Set directAndIndirectlyInstantiatedTypes -> G
-    java.util.Set instantiatedAppServices -> O
+    com.android.tools.r8.graph.FieldAccessInfoCollectionImpl fieldAccessInfoCollection -> n
+    com.android.tools.r8.shaking.Enqueuer$SetWithReason targetedMethods -> B
+    java.util.Set instantiatedAppServices -> I
+    com.android.tools.r8.shaking.Enqueuer$Mode mode -> b
+    java.util.Set bootstrapMethods -> C
+    java.util.Set lambdaMethodsTargetedByInvokeDynamic -> E
+    java.util.Set pinnedItems -> O
+    java.util.Map interfaceInvokes -> j
     java.util.Set staticFieldsWrittenOutsideEnclosingStaticInitializer -> p
     com.android.tools.r8.graph.AppInfoWithSubtyping appInfo -> d
+    com.android.tools.r8.shaking.Enqueuer$SetWithReason instantiatedTypes -> z
     java.util.Map directInvokes -> l
-    com.android.tools.r8.shaking.EnqueuerWorklist workList -> Q
-    boolean forceProguardCompatibility -> a
-    java.util.Set lambdaMethodsTargetedByInvokeDynamic -> K
-    com.android.tools.r8.shaking.Enqueuer$GraphReporter graphReporter -> Y
-    java.util.Set brokenSuperInvokes -> y
-    java.util.Map staticInvokes -> m
-    java.util.Set reportedMissing -> T
-    com.android.tools.r8.graph.AppView appView -> e
-    java.util.Map methodNodes -> u
-    com.android.tools.r8.shaking.Enqueuer$SetWithReason liveFields -> N
-    java.util.Map scopedMethodsForLiveTypes -> X
-    com.android.tools.r8.shaking.ProguardClassFilter dontWarnPatterns -> h
-    java.util.Set liveNonProgramTypes -> D
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> Z
-    com.android.tools.r8.shaking.Enqueuer$SetWithReason liveAnnotations -> E
-    java.util.Map virtualInvokes -> i
-    com.android.tools.r8.shaking.CollectingGraphConsumer verificationGraphConsumer -> a0
-    java.util.Set callSites -> q
-    java.util.Set virtualMethodsTargetedByInvokeDirect -> L
-    java.util.Set pinnedItems -> U
-    java.util.Map reachableVirtualMethods -> z
-    com.android.tools.r8.utils.InternalOptions options -> f
-    java.util.Map fieldNodes -> v
-    java.util.Map superInvokeDependencies -> A
-    com.android.tools.r8.graph.FieldAccessInfoCollectionImpl fieldAccessInfoCollection -> n
-    java.util.Set bootstrapMethods -> I
-    com.android.tools.r8.shaking.Enqueuer$Mode mode -> b
-    com.android.tools.r8.shaking.Enqueuer$SetWithReason instantiatedTypes -> F
-    java.util.Map interfaceInvokes -> j
     java.util.Set identifierNameStrings -> r
-    1:1:void <clinit>():117:117 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):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>
+    boolean forceProguardCompatibility -> a
+    1:1:void <clinit>():103:103 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):293:293 -> <init>
+    2:185:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):131:314 -> <init>
     1:1:void com.android.tools.r8.graph.analysis.EnqueuerAnalysis.processNewlyLiveField(com.android.tools.r8.graph.DexEncodedField):0:0 -> a
-    1:1:void lambda$markInstanceFieldAsLive$21(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1709 -> a
+    1:1:void lambda$markInstanceFieldAsLive$21(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1713 -> a
     boolean lambda$markVirtualMethodAsReachable$25(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod) -> a
     void lambda$newSetWithoutReasonReporter$1(java.lang.Object,com.android.tools.r8.shaking.KeepReason) -> a
-    2:2:com.android.tools.r8.shaking.Enqueuer$GraphReporter access$000(com.android.tools.r8.shaking.Enqueuer):117:117 -> a
-    3:3:void access$1400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):117:117 -> a
-    4:4:com.android.tools.r8.graph.DexProgramClass access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):117:117 -> a
-    5:5:void access$1900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):117:117 -> a
-    6:6:void access$2000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,java.util.function.Function):117:117 -> a
-    7:7:void access$2300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):117:117 -> a
-    8:8:void access$3200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):117:117 -> a
-    9:9:void access$4300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):117:117 -> a
-    10:10:void access$4500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):117:117 -> a
-    11:11:boolean access$500(com.android.tools.r8.shaking.Enqueuer,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):117:117 -> a
-    12:12:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):345:345 -> a
-    13:14:java.util.Set instanceFieldsWrittenOnlyInEnclosingInstanceInitializers():378:379 -> a
-    15:38:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):390:413 -> a
-    39:39:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):409:409 -> a
-    40:53:void lambda$getNonPinnedWrittenFields$0(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):393:406 -> a
-    54:54:void enqueueRootItems(java.util.Map):422:422 -> a
-    55:57:void enqueueRootItem(java.util.Map$Entry):426:428 -> a
-    58:58:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):436:436 -> a
-    58:58:void enqueueRootItem(java.util.Map$Entry):428 -> a
-    59:66:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):441:448 -> a
-    67:67:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
-    67:67:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):449 -> a
-    68:71:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):450:453 -> a
-    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):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
-    95:95:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):469:469 -> a
-    96:98:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):504:506 -> a
-    99:102:boolean registerMethodWithTargetAndContext(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):527:530 -> a
-    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: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 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
+    2:2:com.android.tools.r8.shaking.GraphReporter access$100(com.android.tools.r8.shaking.Enqueuer):103:103 -> a
+    3:3:void access$1500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):103:103 -> a
+    4:4:com.android.tools.r8.graph.DexProgramClass access$1800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):103:103 -> a
+    5:5:void access$2000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103:103 -> a
+    6:6:void access$2100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,java.util.function.Function):103:103 -> a
+    7:7:void access$2200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> a
+    8:8:void access$2400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):103:103 -> a
+    9:9:void access$3300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):103:103 -> a
+    10:10:void access$4100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):103:103 -> a
+    11:11:void access$4400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):103:103 -> a
+    12:12:boolean access$600(com.android.tools.r8.shaking.Enqueuer,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):103:103 -> a
+    13:13:com.android.tools.r8.shaking.GraphReporter getGraphReporter():322:322 -> a
+    14:14:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):326:326 -> a
+    15:22:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):335:342 -> a
+    23:27:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):350:354 -> a
+    23:27:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):342 -> a
+    28:28:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):345:345 -> a
+    29:52:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):371:394 -> a
+    53:53:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):390:390 -> a
+    54:67:void lambda$getNonPinnedWrittenFields$0(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):374:387 -> a
+    68:68:void enqueueRootItems(java.util.Map):403:403 -> a
+    69:71:void enqueueRootItem(java.util.Map$Entry):407:409 -> a
+    72:72:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):417:417 -> a
+    72:72:void enqueueRootItem(java.util.Map$Entry):409 -> a
+    73:80:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):422:429 -> a
+    81:81:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
+    81:81:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):430 -> a
+    82:85:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):431:434 -> a
+    86:90:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):432:436 -> a
+    91:91:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):733:733 -> a
+    91:91:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):436 -> a
+    92:92:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.isExternalizable(com.android.tools.r8.graph.DexType):598:598 -> a
+    92:92:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):733 -> a
+    92:92:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):436 -> a
+    93:108:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):437:452 -> a
+    109:109:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):450:450 -> a
+    110:116:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):456:462 -> a
+    117:120:boolean registerMethodWithTargetAndContext(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):508:511 -> a
+    121:121:java.util.Set lambda$registerMethodWithTargetAndContext$3(com.android.tools.r8.graph.DexMethod):511:511 -> a
+    122:123:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):525:526 -> a
+    124:152:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod,boolean):531:559 -> a
+    153:153:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1038:1038 -> a
+    154:162:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1611:1619 -> a
+    154:162:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1040 -> a
+    163:163:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1618:1618 -> a
+    163:163:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1040 -> a
+    164:164:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1615:1615 -> a
+    164:164:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1040 -> a
+    165:175:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1045:1055 -> a
+    165:175:com.android.tools.r8.graph.DexMethod access$1300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
+    176:191:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1093:1108 -> a
+    192:192:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1105:1105 -> a
+    193:197:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1120:1124 -> a
+    198:198:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    198:198:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1125 -> a
+    199:199:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1128:1128 -> a
+    200:200:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):36:36 -> a
+    200:200:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1128 -> a
+    201:201:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1130:1130 -> a
+    202:226:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1208:1232 -> a
+    202:226:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1131 -> a
+    227:232:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1134:1139 -> a
+    233:236:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1198:1201 -> a
+    233:236:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1157 -> a
+    237:242:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):341:346 -> a
+    237:242:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1201 -> a
+    237:242:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1157 -> a
+    243:243:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1202:1202 -> a
+    243:243:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1157 -> a
+    244:252:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1161:1169 -> a
+    253:263:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):467:477 -> a
+    253:263:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1170 -> a
+    264:264:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
+    264:264:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):478 -> a
+    264:264:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1170 -> a
+    265:265:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):478:478 -> a
+    265:265:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1170 -> a
+    266:278:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1173:1185 -> a
+    279:279:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
+    279:279:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1186 -> a
+    280:280:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1186:1186 -> a
+    281:281:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):495:495 -> a
+    281:281:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1185 -> a
+    282:282:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):417:417 -> a
+    282:282:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):498 -> a
+    282:282:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1185 -> a
+    283:283:boolean lambda$markTypeAsLive$8(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1180:1180 -> a
+    284:287:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexClass):1190:1193 -> a
+    288:288:void enqueueDependentItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexDefinition,java.util.Set):1238:1238 -> a
+    289:289:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1242:1242 -> a
+    290:290:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1248:1248 -> a
+    290:290:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1243 -> a
+    291:291:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1248:1248 -> a
+    291:291:void lambda$markMethodAsLive$34(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):2480 -> a
+    292:300:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1252:1260 -> a
+    301:301:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.annotatedOn(com.android.tools.r8.graph.DexDefinition):24:24 -> a
+    301:301:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1264 -> a
+    302:305:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1265:1268 -> a
+    306:326:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1272:1292 -> a
+    306:326:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):103 -> a
+    327:328:void registerClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1299:1300 -> a
+    327:328:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1293 -> a
+    327:328:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):103 -> a
+    329:329:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1294:1294 -> a
+    329:329:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):103 -> a
+    330:330:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1306:1306 -> a
+    331:355:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1343:1367 -> a
+    356:356:void reportMissingField(com.android.tools.r8.graph.DexField):1385:1385 -> a
+    356:356:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):103 -> a
+    357:357:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    357:357:void reportMissingField(com.android.tools.r8.graph.DexField):1386 -> a
+    357:357:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):103 -> a
+    358:358:void reportMissingField(com.android.tools.r8.graph.DexField):1385:1385 -> a
+    358:358:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):103 -> a
+    359:373:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1423:1437 -> a
+    374:374:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    374:374:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1437 -> a
+    375:375:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1440:1440 -> a
+    376:403:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1484:1511 -> a
+    376:403:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1443 -> a
+    404:404:com.android.tools.r8.shaking.Enqueuer$Mode getMode():318:318 -> a
+    404:404:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1516 -> a
+    404:404:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1443 -> a
+    405:418:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1516:1529 -> a
+    405:418:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1443 -> a
+    419:440:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):1549:1570 -> a
+    419:440:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1530 -> a
+    419:440:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1443 -> a
+    441:450:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1532:1541 -> a
+    441:450:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1443 -> a
+    451:455:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1631:1635 -> a
+    451:455:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1445 -> a
+    456:456:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):36:36 -> a
+    456:456:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1635 -> a
+    456:456:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1445 -> a
+    457:461:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1635:1639 -> a
+    457:461:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1445 -> a
+    462:462:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1447:1447 -> a
+    463:463:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1428:1428 -> a
+    464:464:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexProgramClass.asProgramClass():0:0 -> a
+    464:464:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1428 -> a
+    465:466:void markResolutionAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):1576:1577 -> a
+    467:470:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1579:1582 -> a
+    471:502:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2412:2443 -> a
+    471:502:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1583 -> a
+    503:504:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1584:1585 -> a
+    505:505:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.isLibraryMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):48:48 -> a
+    505:505:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1588 -> a
+    506:506:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1585:1585 -> a
+    507:514:void transitionDefaultMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1598:1605 -> a
+    515:515:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1656:1656 -> a
+    516:536:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1725:1745 -> a
+    516:536:void access$2800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
+    537:537:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> a
+    537:537:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1746 -> a
+    537:537:void access$2800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
+    538:539:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1747:1748 -> a
+    538:539:void access$2800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
+    540:540:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):1786:1786 -> a
+    541:541:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$22(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1818:1818 -> a
+    542:542:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markInstanceFieldAsReachable$24(com.android.tools.r8.graph.DexProgramClass):1839:1839 -> a
+    543:543:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847:1847 -> a
+    544:570:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1855:1881 -> a
+    544:570:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    571:571:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    571:571:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1882 -> a
+    571:571:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    572:609:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1974:2011 -> a
+    572:609:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1886 -> a
+    572:609:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    610:625:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2029:2044 -> a
+    610:625:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2010 -> a
+    610:625:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1886 -> a
+    610:625:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    626:629:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2030:2033 -> a
+    626:629:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2010 -> a
+    626:629:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1886 -> a
+    626:629:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    630:638:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2032:2040 -> a
+    630:638:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2010 -> a
+    630:638:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1886 -> a
+    630:638:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    639:648:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2012:2021 -> a
+    639:648:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1886 -> a
+    639:648:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    649:662:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1887:1900 -> a
+    649:662:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    663:663:java.util.Set com.android.tools.r8.graph.ResolutionResult.lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):33:33 -> a
+    663:663:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1901 -> a
+    663:663:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    664:671:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1902:1909 -> a
+    664:671:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    672:672:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1917:1917 -> a
+    673:673:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    673:673:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1050 -> a
+    673:673:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1917 -> a
+    674:686:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1917:1929 -> a
+    687:687:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1807:1807 -> a
+    687:687:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1937 -> a
+    688:711:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1941:1964 -> a
+    712:718:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1961:1967 -> a
+    719:722:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1944:1947 -> a
+    723:723:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1944:1944 -> a
+    724:735:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2077:2088 -> a
+    736:736:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.targetedBySuperFrom(com.android.tools.r8.graph.DexEncodedMethod):68:68 -> a
+    736:736:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2091 -> a
+    737:756:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2090:2109 -> a
+    757:757:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    757:757:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2109 -> a
+    758:763:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2112:2117 -> a
+    764:771:java.util.Set traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2126:2133 -> a
+    772:779:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2142:2149 -> a
+    780:782:boolean verifyKeptGraph():2154:2156 -> a
+    780:782:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2149 -> a
+    783:783:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2150:2150 -> a
+    784:799:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2163:2178 -> a
+    800:821:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2177:2198 -> a
+    822:827:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):2234:2239 -> a
+    822:827:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2212 -> a
+    828:832:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2213:2217 -> a
+    833:835:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2216:2218 -> a
+    836:836:void lambda$createAppInfo$28(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder,com.android.tools.r8.graph.DexAnnotation):2165:2165 -> a
+    837:837:boolean lambda$createAppInfo$29(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):2170:2170 -> a
+    838:843:java.util.SortedSet toSortedDescriptorSet(java.util.Set):2224:2229 -> a
+    844:870:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2245:2271 -> a
+    871:871:void com.android.tools.r8.shaking.RootSetBuilder.<init>(com.android.tools.r8.graph.AppView,java.util.Collection):106:106 -> a
+    871:871:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2271 -> a
+    872:936:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2272:2336 -> a
+    937:946:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2335:2344 -> a
+    947:951:void unpinLambdaMethods():2350:2354 -> a
+    947:951:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2346 -> a
+    952:952:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2344:2344 -> a
+    953:953:java.util.Set lambda$trace$30(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):2268:2268 -> a
+    954:954:void lambda$trace$31(com.android.tools.r8.graph.DexReference,java.util.Map):2289:2289 -> a
+    955:955:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2294:2294 -> a
+    956:956:boolean com.android.tools.r8.graph.DexType.isDexType():0:0 -> a
+    956:956:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2294 -> a
+    957:957:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2295:2295 -> a
+    958:958:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):495:495 -> a
+    958:958:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2296 -> a
+    959:959:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):417:417 -> a
+    959:959:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):498 -> a
+    959:959:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2296 -> a
+    960:960:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.asDexType():0:0 -> a
+    960:960:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2295 -> a
+    961:989:void markMethodAsKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2359:2387 -> a
+    990:999:void markMethodAsKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2384:2393 -> a
+    1000:1007:void markFieldAsKept(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2399:2406 -> a
+    1008:1019:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2453:2464 -> a
+    1020:1020:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    1020:1020:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2464 -> a
+    1021:1025:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2466:2470 -> a
+    1026:1029:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2469:2472 -> a
+    1030:1047:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2471:2488 -> a
+    1048:1048:void lambda$markMethodAsLive$35(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2488:2488 -> a
+    1049:1051:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2502:2504 -> a
+    1052:1052:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
+    1052:1052:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2504 -> a
+    1053:1053:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2504:2504 -> a
+    1054:1066:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):2848:2860 -> a
     1:1:void com.android.tools.r8.graph.analysis.EnqueuerAnalysis.processNewlyLiveField(com.android.tools.r8.graph.DexEncodedField):0:0 -> b
-    1:1:void lambda$markStaticFieldAsLive$20(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):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
-    5:5:void access$4400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):117:117 -> b
-    6:6:void access$800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):117:117 -> b
-    7:7:boolean isProgramClass(com.android.tools.r8.graph.DexType):350:350 -> b
-    7:7:boolean access$2200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):117 -> b
-    8:15:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):354:361 -> b
-    16:20:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):369:373 -> b
-    16:20:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):361 -> b
-    21:21:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):364:364 -> b
-    22:22:com.android.tools.r8.shaking.Enqueuer$SetWithReason newSetWithoutReasonReporter():418:418 -> b
-    23:23:java.util.Set lambda$registerMethodWithTargetAndContext$3(com.android.tools.r8.graph.DexMethod):530:530 -> b
-    24:24:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):536:536 -> b
-    25:39:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1091:1105 -> b
-    40:40:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1103:1103 -> b
-    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):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):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):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):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):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
-    5:5:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):540:540 -> c
-    6:6:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$10(com.android.tools.r8.graph.DexType):1210:1210 -> c
-    7:7:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1396:1396 -> c
-    8:8:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    8:8:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1397 -> c
-    9:22:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1409:1422 -> c
-    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):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):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):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):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):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):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):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):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):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):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):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):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):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):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):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):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):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):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):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):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
-    4:18:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1438:1452 -> f
-    19:19:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> f
-    19:19:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1452 -> f
-    20:20:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1455:1455 -> f
-    21:48:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1499:1526 -> f
-    21:48:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1458 -> f
-    49:49:com.android.tools.r8.shaking.Enqueuer$Mode getMode():341:341 -> f
-    49:49:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1531 -> f
-    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):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):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):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):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):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
-    2:3:void reportMissingClass(com.android.tools.r8.graph.DexType):1390:1391 -> j
-    4:4:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> j
-    4:4:void reportMissingClass(com.android.tools.r8.graph.DexType):1391 -> j
-    1:1:java.util.Set access$2900(com.android.tools.r8.shaking.Enqueuer):117:117 -> k
-    1:1:java.util.Set access$300(com.android.tools.r8.shaking.Enqueuer):117:117 -> l
-    1:1:java.util.Set access$3000(com.android.tools.r8.shaking.Enqueuer):117:117 -> m
-    1:1:java.util.Set access$3100(com.android.tools.r8.shaking.Enqueuer):117:117 -> n
-    1:1:boolean access$3300(com.android.tools.r8.shaking.Enqueuer):117:117 -> o
-    1:1:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl access$3500(com.android.tools.r8.shaking.Enqueuer):117:117 -> p
-    1:1:java.util.Map access$400(com.android.tools.r8.shaking.Enqueuer):117:117 -> q
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphConsumer access$4600(com.android.tools.r8.shaking.Enqueuer):117:117 -> r
-    1:1:com.android.tools.r8.shaking.EnqueuerWorklist access$600(com.android.tools.r8.shaking.Enqueuer):117:117 -> s
-    1:1:java.util.Map access$700(com.android.tools.r8.shaking.Enqueuer):117:117 -> t
-    1:1:java.util.Map access$900(com.android.tools.r8.shaking.Enqueuer):117:117 -> u
+    1:1:void lambda$markStaticFieldAsLive$20(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1695 -> b
+    2:2:java.util.Map access$1000(com.android.tools.r8.shaking.Enqueuer):103:103 -> b
+    3:3:void access$2600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103:103 -> b
+    4:4:void access$4200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> b
+    5:5:void access$900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> b
+    6:6:boolean isProgramClass(com.android.tools.r8.graph.DexType):331:331 -> b
+    6:6:boolean access$2300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):103 -> b
+    7:8:java.util.Set instanceFieldsWrittenOnlyInEnclosingInstanceInitializers():359:360 -> b
+    9:11:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):485:487 -> b
+    12:12:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):517:517 -> b
+    13:28:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1074:1089 -> b
+    29:29:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1086:1086 -> b
+    30:32:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1112:1114 -> b
+    33:33:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1112:1112 -> b
+    34:34:void lambda$markTypeAsLive$9(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1181:1181 -> b
+    35:35:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$10(com.android.tools.r8.graph.DexType):1192:1192 -> b
+    36:36:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1248:1248 -> b
+    36:36:void lambda$markMethodAsTargeted$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1402 -> b
+    37:65:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1310:1338 -> b
+    66:66:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1379:1379 -> b
+    67:67:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
+    67:67:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1380 -> b
+    68:74:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1646:1652 -> b
+    75:75:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$17(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1657:1657 -> b
+    76:77:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):1790:1791 -> b
+    78:79:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1812:1813 -> b
+    80:80:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
+    80:80:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1814 -> b
+    81:96:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1817:1832 -> b
+    97:97:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1807:1807 -> b
+    97:97:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1834 -> b
+    98:103:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1835:1840 -> b
+    104:104:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$23(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1820:1820 -> b
+    105:105:com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet lambda$markPossibleTargetsAsReachable$26(com.android.tools.r8.graph.DexProgramClass):1928:1928 -> b
+    106:110:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2048:2052 -> b
+    106:110:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2060 -> b
+    111:111:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> b
+    111:111:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2052 -> b
+    111:111:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2060 -> b
+    112:112:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2052:2052 -> b
+    112:112:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2060 -> b
+    113:118:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2051:2056 -> b
+    113:118:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2060 -> b
+    119:125:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2060:2066 -> b
+    126:126:void lambda$trace$33(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2316:2316 -> b
+    127:129:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2528:2530 -> b
+    130:130:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> b
+    130:130:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2531 -> b
+    131:132:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2532:2533 -> b
+    133:139:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2539:2545 -> b
+    133:139:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    140:147:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2634:2641 -> b
+    140:147:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2546 -> b
+    140:147:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    148:156:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2640:2648 -> b
+    148:156:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2546 -> b
+    148:156:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    157:157:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> b
+    157:157:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2652 -> b
+    157:157:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2546 -> b
+    157:157:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    158:161:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2654:2657 -> b
+    158:161:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2546 -> b
+    158:161:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    162:162:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2549:2549 -> b
+    162:162:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    163:168:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2664:2669 -> b
+    163:168:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2550 -> b
+    163:168:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    169:169:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    169:169:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2669 -> b
+    169:169:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2550 -> b
+    169:169:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    170:184:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2670:2684 -> b
+    170:184:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2550 -> b
+    170:184:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    185:211:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2683:2709 -> b
+    185:211:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2550 -> b
+    185:211:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    212:212:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> b
+    212:212:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2711 -> b
+    212:212:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2550 -> b
+    212:212:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    213:257:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2713:2757 -> b
+    213:257:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2550 -> b
+    213:257:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    258:258:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    258:258:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2669 -> b
+    258:258:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2550 -> b
+    258:258:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    259:259:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2553:2553 -> b
+    259:259:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    260:265:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2804:2809 -> b
+    260:265:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2554 -> b
+    260:265:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    266:266:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2557:2557 -> b
+    266:266:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    267:294:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2767:2794 -> b
+    267:294:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2558 -> b
+    267:294:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    295:295:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2561:2561 -> b
+    295:295:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    296:301:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2815:2820 -> b
+    296:301:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2562 -> b
+    296:301:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    302:302:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    302:302:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2820 -> b
+    302:302:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2562 -> b
+    302:302:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    303:315:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2821:2833 -> b
+    303:315:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2562 -> b
+    303:315:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    316:332:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2826:2842 -> b
+    316:332:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2562 -> b
+    316:332:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    333:333:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    333:333:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2820 -> b
+    333:333:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2562 -> b
+    333:333:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    334:348:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2565:2579 -> b
+    334:348:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    349:349:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> b
+    349:349:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2580 -> b
+    349:349:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    350:378:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2581:2609 -> b
+    350:378:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    379:379:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):517:517 -> b
+    379:379:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2609 -> b
+    379:379:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    380:380:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2610:2610 -> b
+    380:380:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    381:381:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):521:521 -> b
+    381:381:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2610 -> b
+    381:381:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    382:396:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2613:2627 -> b
+    382:396:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    397:397:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2625:2625 -> b
+    397:397:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    398:398:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2624:2624 -> b
+    398:398:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    399:399:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> b
+    399:399:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2531 -> b
+    1:1:java.util.Map access$1200(com.android.tools.r8.shaking.Enqueuer):103:103 -> c
+    2:2:void access$4300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> c
+    3:3:com.android.tools.r8.shaking.Enqueuer$SetWithReason newSetWithoutReasonReporter():399:399 -> c
+    4:4:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):521:521 -> c
+    5:5:java.util.Set lambda$handleAnnotation$11(com.android.tools.r8.graph.DexType):1260:1260 -> c
+    6:6:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markMethodAsTargeted$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1398:1398 -> c
+    7:19:void populateInstantiatedTypesCache(com.android.tools.r8.graph.DexProgramClass):1451:1463 -> c
+    20:20:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$18(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1664:1664 -> c
+    21:26:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1699:1704 -> c
+    27:27:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
+    27:27:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1704 -> c
+    28:35:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1706:1713 -> c
+    36:44:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1755:1763 -> c
+    45:46:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.DexEncodedMethod):1063:1064 -> c
+    45:46:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1763 -> c
+    47:47:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1764:1764 -> c
+    48:48:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1069:1069 -> c
+    48:48:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1764 -> c
+    49:51:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1765:1767 -> c
+    52:52:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
+    52:52:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1766 -> c
+    53:57:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1795:1799 -> c
+    58:58:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> c
+    58:58:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1800 -> c
+    59:60:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1802:1803 -> c
+    61:61:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> c
+    61:61:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1800 -> c
+    62:62:java.util.Set lambda$markSuperMethodAsReachable$27(com.android.tools.r8.graph.DexEncodedMethod):2113:2113 -> c
+    63:68:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2510:2515 -> c
+    63:68:void access$3500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
+    69:69:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> c
+    69:69:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2516 -> c
+    69:69:void access$3500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
+    70:72:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2517:2519 -> c
+    70:72:void access$3500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
+    73:73:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2517:2517 -> c
+    73:73:void access$3500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
+    74:74:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2510:2510 -> c
+    74:74:void access$3500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
+    1:1:java.util.Map access$1400(com.android.tools.r8.shaking.Enqueuer):103:103 -> d
+    2:3:java.util.Set staticFieldsWrittenOnlyInEnclosingStaticInitializer():365:366 -> d
+    4:4:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$4(com.android.tools.r8.graph.DexType):1088:1088 -> d
+    5:6:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1656:1657 -> d
+    7:13:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1662:1668 -> d
+    14:15:void registerClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1299:1300 -> d
+    14:15:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1673 -> d
+    16:17:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1678:1679 -> d
+    18:18:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
+    18:18:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1680 -> d
+    19:19:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1683:1683 -> d
+    20:20:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
+    20:20:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1684 -> d
+    21:28:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1688:1695 -> d
+    29:29:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$19(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1666:1666 -> d
+    30:31:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1718:1719 -> d
+    32:32:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
+    32:32:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1719 -> d
+    33:33:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1721:1721 -> d
+    34:38:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2492:2496 -> d
+    39:39:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$36(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2494:2494 -> d
+    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping access$1600(com.android.tools.r8.shaking.Enqueuer):103:103 -> e
+    2:2:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$5(com.android.tools.r8.graph.DexType):1107:1107 -> e
+    3:16:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1392:1405 -> e
+    17:17:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> e
+    17:17:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1405 -> e
+    18:21:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1407:1410 -> e
+    22:22:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2524:2524 -> e
+    22:22:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1411 -> e
+    23:28:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):182:187 -> e
+    23:28:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2524 -> e
+    23:28:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1411 -> e
+    29:29:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2524:2524 -> e
+    29:29:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1411 -> e
+    30:30:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):182:182 -> e
+    30:30:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2524 -> e
+    30:30:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1411 -> e
+    31:31:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$37(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2498:2498 -> e
+    1:1:java.util.Set access$1900(com.android.tools.r8.shaking.Enqueuer):103:103 -> f
+    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$registerMethodWithTargetAndContext$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):510:510 -> f
+    3:3:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$6(com.android.tools.r8.graph.DexType):1114:1114 -> f
+    4:8:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1773:1777 -> f
+    9:9:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1775:1775 -> f
+    10:10:boolean com.android.tools.r8.shaking.KeepReason.isDueToKeepRule():0:0 -> f
+    10:10:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1776 -> f
+    11:12:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1778:1779 -> f
+    13:13:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> f
+    13:13:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1780 -> f
+    1:1:com.android.tools.r8.graph.AppView access$200(com.android.tools.r8.shaking.Enqueuer):103:103 -> g
+    2:2:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$7(com.android.tools.r8.graph.DexType):1137:1137 -> g
+    1:1:java.util.Set access$2500(com.android.tools.r8.shaking.Enqueuer):103:103 -> h
+    2:3:void reportMissingClass(com.android.tools.r8.graph.DexType):1373:1374 -> h
+    4:4:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> h
+    4:4:void reportMissingClass(com.android.tools.r8.graph.DexType):1374 -> h
+    1:1:java.util.Set access$2700(com.android.tools.r8.shaking.Enqueuer):103:103 -> i
+    1:1:com.android.tools.r8.utils.InternalOptions access$2900(com.android.tools.r8.shaking.Enqueuer):103:103 -> j
+    1:1:java.util.Set access$300(com.android.tools.r8.shaking.Enqueuer):103:103 -> k
+    1:1:java.util.Set access$3000(com.android.tools.r8.shaking.Enqueuer):103:103 -> l
+    1:1:java.util.Set access$3100(com.android.tools.r8.shaking.Enqueuer):103:103 -> m
+    1:1:java.util.Set access$3200(com.android.tools.r8.shaking.Enqueuer):103:103 -> n
+    1:1:boolean access$3400(com.android.tools.r8.shaking.Enqueuer):103:103 -> o
+    1:1:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl access$3600(com.android.tools.r8.shaking.Enqueuer):103:103 -> p
+    1:1:java.util.Set access$400(com.android.tools.r8.shaking.Enqueuer):103:103 -> q
+    1:1:java.util.Map access$500(com.android.tools.r8.shaking.Enqueuer):103:103 -> r
+    1:1:com.android.tools.r8.shaking.EnqueuerWorklist access$700(com.android.tools.r8.shaking.Enqueuer):103:103 -> s
+    1:1:java.util.Map access$800(com.android.tools.r8.shaking.Enqueuer):103:103 -> t
 com.android.tools.r8.shaking.Enqueuer$1 -> com.android.tools.r8.N.s:
-    int[] $SwitchMap$com$android$tools$r8$shaking$EnqueuerWorklist$Action$Kind -> b
     int[] $SwitchMap$com$android$tools$r8$graph$DexMethodHandle$MethodHandleType -> a
-    1:1:void <clinit>():2261:2261 -> <clinit>
-    2:2:void <clinit>():990:990 -> <clinit>
+    1:1:void <clinit>():972:972 -> <clinit>
 com.android.tools.r8.shaking.Enqueuer$AnnotationReferenceMarker -> com.android.tools.r8.N.t:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.shaking.Enqueuer this$0 -> d
     com.android.tools.r8.graph.DexItem annotationHolder -> a
     com.android.tools.r8.shaking.KeepReason reason -> c
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.shaking.Enqueuer$1):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:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.shaking.Enqueuer$1):3001:3001 -> <init>
+    2:5:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason):3008:3011 -> <init>
     boolean addCallSite(com.android.tools.r8.graph.DexCallSite) -> a
     boolean addClass(com.android.tools.r8.graph.DexProgramClass) -> a
     boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle) -> a
     boolean addProto(com.android.tools.r8.graph.DexProto) -> a
     boolean addString(com.android.tools.r8.graph.DexString) -> a
-    1:15:boolean addField(com.android.tools.r8.graph.DexField):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>():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):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>():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>():3319:3319 -> <init>
-com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget -> com.android.tools.r8.N.x:
+    1:15:boolean addField(com.android.tools.r8.graph.DexField):3021:3035 -> b
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> b
+    16:16:boolean addField(com.android.tools.r8.graph.DexField):3035 -> b
+    17:29:boolean addField(com.android.tools.r8.graph.DexField):3035:3047 -> b
+    30:39:boolean addMethod(com.android.tools.r8.graph.DexMethod):3055:3064 -> b
+    40:47:boolean addMethod(com.android.tools.r8.graph.DexMethod):3063:3070 -> b
+    48:49:boolean addType(com.android.tools.r8.graph.DexType):3100:3101 -> b
+com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget -> com.android.tools.r8.N.u:
     com.android.tools.r8.graph.DexClass holder -> a
     com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget UNRESOLVED -> c
     com.android.tools.r8.graph.DexEncodedMethod method -> b
     boolean $assertionsDisabled -> d
-    1:3:void <clinit>():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
+    1:3:void <clinit>():2907:2909 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):2918:2921 -> <init>
+    1:1:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget unresolved():2915:2915 -> a
+    1:1:boolean isUnresolved():2925 -> a
+    1:1:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget unresolved():2915:2915 -> b
+    1:2:boolean equals(java.lang.Object):2937:2938 -> equals
+    1:1:int hashCode():2931:2931 -> hashCode
     2:2:int com.android.tools.r8.graph.KeyedDexItem.hashCode():20:20 -> hashCode
-    2:2:int hashCode():2948 -> hashCode
-com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.N.y:
+    2:2:int hashCode():2931 -> hashCode
+com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.N.v:
     com.android.tools.r8.shaking.Enqueuer$Mode WHY_ARE_YOU_KEEPING -> d
     com.android.tools.r8.shaking.Enqueuer$Mode MAIN_DEX_TRACING -> c
     com.android.tools.r8.shaking.Enqueuer$Mode FINAL_TREE_SHAKING -> b
     com.android.tools.r8.shaking.Enqueuer$Mode INITIAL_TREE_SHAKING -> a
-    1:4:void <clinit>():120:123 -> <clinit>
-    1:1:void <init>(java.lang.String,int):119:119 -> <init>
-    1:1:boolean isInitialOrFinalTreeShaking():134:134 -> a
-    2:2:boolean isFinalTreeShaking():130:130 -> a
-    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$ReachableVirtualMethodsSet -> com.android.tools.r8.N.z:
+    1:4:void <clinit>():106:109 -> <clinit>
+    1:1:void <init>(java.lang.String,int):105:105 -> <init>
+    1:1:boolean isInitialOrFinalTreeShaking():120:120 -> a
+    2:2:boolean isFinalTreeShaking():116:116 -> a
+    2:2:boolean isInitialOrFinalTreeShaking():120 -> a
+    1:1:boolean isInitialTreeShaking():112:112 -> b
+    1:1:boolean isTracingMainDex():124:124 -> c
+com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet -> com.android.tools.r8.N.w:
     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:
+    1:4:void <init>():2942:2945 -> <init>
+    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):2942:2942 -> <init>
+    1:1:java.util.Set getMethods():2948:2948 -> a
+    2:2:java.util.Set getReasons(com.android.tools.r8.graph.DexEncodedMethod):2952:2952 -> a
+    2:2:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):2956 -> a
+    3:8:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):2958:2963 -> a
+    9:9:java.util.Set getReasons(com.android.tools.r8.graph.DexEncodedMethod):2952:2952 -> a
+com.android.tools.r8.shaking.Enqueuer$SetWithReason -> com.android.tools.r8.N.x:
     java.util.Set items -> a
     java.util.function.BiConsumer register -> b
-    1:1:void <init>(java.util.function.BiConsumer):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:
+    1:1:void <init>(java.util.function.BiConsumer):2889:2889 -> <init>
+    2:7:void <init>(java.util.function.BiConsumer):2885:2890 -> <init>
+    1:1:java.util.Set access$3800(com.android.tools.r8.shaking.Enqueuer$SetWithReason):2883:2883 -> a
+    2:3:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):2894:2895 -> a
+    4:4:boolean contains(java.lang.Object):2899:2899 -> a
+    5:5:java.util.Set getItems():2903:2903 -> a
+com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason -> com.android.tools.r8.N.y:
+    java.util.Set items -> a
+    boolean $assertionsDisabled -> b
+    1:1:void <clinit>():2865:2865 -> <clinit>
+    1:3:void <init>():2865:2867 -> <init>
+    4:4:void <init>(com.android.tools.r8.shaking.Enqueuer$1):2865:2865 -> <init>
+    1:1:java.util.Set access$3900(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):2865:2865 -> a
+    2:3:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2870:2871 -> a
+    4:4:boolean contains(java.lang.Object):2875:2875 -> a
+    5:5:java.util.Set getItems():2879:2879 -> a
+com.android.tools.r8.shaking.Enqueuer$UseRegistry -> com.android.tools.r8.N.z:
     com.android.tools.r8.shaking.Enqueuer this$0 -> e
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexProgramClass currentHolder -> c
     com.android.tools.r8.graph.DexEncodedMethod currentMethod -> d
-    1:1:void <clinit>():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>
-    2:6:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):586:590 -> <init>
-    1:1:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportClassReferenced(com.android.tools.r8.graph.DexProgramClass):594:594 -> a
-    2:2:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):624:624 -> a
-    3:6:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):628:631 -> a
+    1:1:void <clinit>():562:562 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$1):562:562 -> <init>
+    2:6:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):567:571 -> <init>
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferenced(com.android.tools.r8.graph.DexProgramClass):575:575 -> a
+    2:2:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):605:605 -> a
+    3:6:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):609:612 -> a
     7:7:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    7:7:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):632 -> a
-    8:8:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):634:634 -> a
-    9:27:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):752:770 -> a
+    7:7:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):613 -> a
+    8:8:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):615:615 -> a
+    9:27:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):733:751 -> a
     28:28:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    28:28:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):771 -> a
-    29:31:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):776:778 -> a
-    32:32:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportClassReferenced(com.android.tools.r8.graph.DexProgramClass):594:594 -> a
-    32:32:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):778 -> a
-    33:39:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):778:784 -> a
-    40:40:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):783:783 -> a
-    41:46:boolean registerNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):794:799 -> a
-    47:47:java.lang.Boolean lambda$registerStaticFieldRead$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):833:833 -> a
-    48:48:boolean registerCheckCast(com.android.tools.r8.graph.DexType):910:910 -> a
-    49:49:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):921:921 -> a
+    28:28:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):752 -> a
+    29:31:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):757:759 -> a
+    32:32:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferenced(com.android.tools.r8.graph.DexProgramClass):575:575 -> a
+    32:32:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):759 -> a
+    33:39:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):759:765 -> a
+    40:40:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):764:764 -> a
+    41:46:boolean registerNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):776:781 -> a
+    47:47:java.lang.Boolean lambda$registerStaticFieldRead$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):815:815 -> a
+    48:48:boolean registerCheckCast(com.android.tools.r8.graph.DexType):892:892 -> a
+    49:49:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):903:903 -> a
     50:50:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
-    50:50:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):928 -> a
-    51:55:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):928:932 -> a
-    56:56:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.methodHandleReferencedIn(com.android.tools.r8.graph.DexEncodedMethod):88:88 -> a
-    56:56:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):932 -> a
-    57:60:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):933:936 -> a
-    61:124:void registerCallSite(com.android.tools.r8.graph.DexCallSite):944:1007 -> a
-    125:134:void registerCallSite(com.android.tools.r8.graph.DexCallSite):995:1004 -> a
-    135:135:void registerCallSite(com.android.tools.r8.graph.DexCallSite):998:998 -> a
-    136:175:void registerCallSite(com.android.tools.r8.graph.DexCallSite):992:1031 -> a
-    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):675:675 -> b
-    2:5:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):679:682 -> b
+    50:50:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):910 -> a
+    51:55:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):910:914 -> a
+    56:56:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.methodHandleReferencedIn(com.android.tools.r8.graph.DexEncodedMethod):76:76 -> a
+    56:56:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):914 -> a
+    57:60:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):915:918 -> a
+    61:125:void registerCallSite(com.android.tools.r8.graph.DexCallSite):926:990 -> a
+    126:136:void registerCallSite(com.android.tools.r8.graph.DexCallSite):977:987 -> a
+    137:137:void registerCallSite(com.android.tools.r8.graph.DexCallSite):986:986 -> a
+    138:138:void registerCallSite(com.android.tools.r8.graph.DexCallSite):980:980 -> a
+    139:179:void registerCallSite(com.android.tools.r8.graph.DexCallSite):974:1014 -> a
+    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):656:656 -> b
+    2:5:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):660:663 -> b
     6:6:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    6:6:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):683 -> b
-    7:7:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):685:685 -> b
-    8:26:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):706:724 -> b
+    6:6:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):664 -> b
+    7:7:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):666:666 -> b
+    8:26:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):687:705 -> b
     27:27:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    27:27:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):725 -> b
-    28:39:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):729:740 -> b
-    40:40:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportClassReferenced(com.android.tools.r8.graph.DexProgramClass):594:594 -> b
-    40:40:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):740 -> b
-    41:47:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):740:746 -> b
-    48:48:java.lang.Boolean lambda$registerStaticFieldWrite$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):878:878 -> b
-    49:49:boolean registerConstClass(com.android.tools.r8.graph.DexType):905:905 -> b
-    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):640:640 -> c
-    2:24:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):644:666 -> c
+    27:27:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):706 -> b
+    28:39:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):710:721 -> b
+    40:40:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferenced(com.android.tools.r8.graph.DexProgramClass):575:575 -> b
+    40:40:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):721 -> b
+    41:47:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):721:727 -> b
+    48:48:java.lang.Boolean lambda$registerStaticFieldWrite$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):860:860 -> b
+    49:49:boolean registerConstClass(com.android.tools.r8.graph.DexType):887:887 -> b
+    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):621:621 -> c
+    2:24:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):625:647 -> c
     25:25:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    25:25:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):667 -> c
-    26:26:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):669:669 -> c
-    27:27:boolean registerNewInstance(com.android.tools.r8.graph.DexType):790:790 -> c
+    25:25:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):648 -> c
+    26:26:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):650:650 -> c
+    27:27:boolean registerNewInstance(com.android.tools.r8.graph.DexType):771:771 -> c
     28:28:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.DexEncodedMethod) -> c
-    28:28:boolean registerNewInstance(com.android.tools.r8.graph.DexType):790 -> c
-    29:29:boolean registerNewInstance(com.android.tools.r8.graph.DexType):790:790 -> c
-    30:48:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):807:825 -> c
+    28:28:boolean registerNewInstance(com.android.tools.r8.graph.DexType):771 -> c
+    29:29:boolean registerNewInstance(com.android.tools.r8.graph.DexType):771:771 -> c
+    30:48:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):789:807 -> c
     49:49:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    49:49:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):825 -> c
-    50:56:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):828:834 -> c
-    57:72:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):831:846 -> c
-    1:8:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):603:610 -> d
-    9:19:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):605:615 -> d
+    49:49:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):807 -> c
+    50:56:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):810:816 -> c
+    57:72:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):813:828 -> c
+    1:8:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):584:591 -> d
+    9:19:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):586:596 -> d
     20:20:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    20:20:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):616 -> d
-    21:21:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):618:618 -> d
-    22:27:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):693:698 -> d
+    20:20:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):597 -> d
+    21:21:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):599:599 -> d
+    22:27:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):674:679 -> d
     28:28:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    28:28:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):698 -> d
-    29:29:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):700:700 -> d
-    30:48:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):852:870 -> d
+    28:28:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):679 -> d
+    29:29:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):681:681 -> d
+    30:48:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):834:852 -> d
     49:49:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    49:49:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):870 -> d
-    50:56:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):873:879 -> d
-    57:80:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):876:899 -> d
-    81:81:boolean registerTypeReference(com.android.tools.r8.graph.DexType):915:915 -> d
-    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.D:
+    49:49:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):852 -> d
+    50:56:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):855:861 -> d
+    57:80:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):858:881 -> d
+    81:81:boolean registerTypeReference(com.android.tools.r8.graph.DexType):897:897 -> d
+    1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):580:580 -> e
+    2:11:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):1020:1029 -> e
+    12:12:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):1028:1028 -> e
+com.android.tools.r8.shaking.EnqueuerFactory -> com.android.tools.r8.N.B:
     1:3:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap com.android.tools.r8.shaking.EnqueuerUtils.toImmutableSortedMap(java.util.Map,java.util.Comparator):15:17 -> a
     4:4:com.android.tools.r8.shaking.Enqueuer createForInitialTreeShaking(com.android.tools.r8.graph.AppView):16:16 -> a
     5:5:com.android.tools.r8.shaking.Enqueuer createForFinalTreeShaking(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):21:21 -> a
     1:1:com.android.tools.r8.shaking.Enqueuer createForMainDexTracing(com.android.tools.r8.graph.AppView):25:25 -> b
     2:2:com.android.tools.r8.shaking.Enqueuer createForMainDexTracing(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):30:30 -> b
     1:1:com.android.tools.r8.shaking.Enqueuer createForWhyAreYouKeeping(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):35:35 -> c
-com.android.tools.r8.shaking.EnqueuerWorklist -> com.android.tools.r8.N.H:
+com.android.tools.r8.shaking.EnqueuerWorklist -> com.android.tools.r8.N.M:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Queue queue -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():16:16 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):48:48 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.AppView):46:49 -> <init>
-    1:1:com.android.tools.r8.shaking.EnqueuerWorklist createWorklist(com.android.tools.r8.graph.AppView):53:53 -> a
-    2:2:boolean isEmpty():57:57 -> a
-    3:3:void enqueueMarkReachableDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):65:65 -> a
-    4:4:void enqueueMarkReachableSuperAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):77:77 -> a
-    5:6:void enqueueMarkReachableFieldAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):82:83 -> a
-    7:8:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):87:88 -> a
-    9:10:void enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):93:94 -> a
-    11:12:void enqueueMarkMethodKeptAction(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):98:99 -> a
-    13:14:void enqueueMarkFieldKeptAction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):103:104 -> a
-    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.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.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
-    com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind MARK_REACHABLE_FIELD -> e
-    com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind MARK_METHOD_KEPT -> h
-    com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind MARK_FIELD_KEPT -> i
-    com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind[] $VALUES -> j
-    com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind MARK_REACHABLE_VIRTUAL -> b
-    com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind MARK_REACHABLE_INTERFACE -> c
-    com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind MARK_REACHABLE_DIRECT -> a
-    1:9:void <clinit>():21:29 -> <clinit>
-    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.I:
+    1:1:void <clinit>():15:15 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):162:162 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.AppView):160:163 -> <init>
+    1:1:com.android.tools.r8.shaking.EnqueuerWorklist createWorklist(com.android.tools.r8.graph.AppView):167:167 -> a
+    2:2:boolean isEmpty():171:171 -> a
+    3:3:void enqueueMarkReachableDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):179:179 -> a
+    4:4:void enqueueMarkReachableSuperAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):191:191 -> a
+    5:6:void enqueueMarkReachableFieldAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):196:197 -> a
+    7:8:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):204:205 -> a
+    9:10:void enqueueMarkMethodKeptAction(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):215:216 -> a
+    11:12:void enqueueMarkFieldKeptAction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):220:221 -> a
+    1:1:com.android.tools.r8.shaking.EnqueuerWorklist$Action poll():175:175 -> b
+    2:2:void enqueueMarkReachableInterfaceAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):187:187 -> b
+    3:4:void enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):210:211 -> b
+    1:1:void enqueueMarkReachableVirtualAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):183:183 -> c
+com.android.tools.r8.shaking.EnqueuerWorklist$Action -> com.android.tools.r8.N.C:
+    1:1:void <init>():17:17 -> <init>
+    void run(com.android.tools.r8.shaking.Enqueuer) -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkFieldKeptAction -> com.android.tools.r8.N.D:
+    com.android.tools.r8.graph.DexEncodedField target -> a
+    com.android.tools.r8.shaking.KeepReason reason -> b
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):148:150 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):155:155 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkInstantiatedAction -> com.android.tools.r8.N.E:
+    com.android.tools.r8.graph.DexProgramClass target -> a
+    com.android.tools.r8.shaking.KeepReason reason -> c
+    com.android.tools.r8.graph.DexEncodedMethod context -> b
+    1:4:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):102:105 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):110:110 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodKeptAction -> com.android.tools.r8.N.F:
+    com.android.tools.r8.graph.DexEncodedMethod target -> a
+    com.android.tools.r8.shaking.KeepReason reason -> b
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):133:135 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):140:140 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodLiveAction -> com.android.tools.r8.N.G:
+    com.android.tools.r8.graph.DexEncodedMethod target -> a
+    com.android.tools.r8.shaking.KeepReason reason -> b
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):118:120 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):125:125 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableDirectAction -> com.android.tools.r8.N.H:
+    com.android.tools.r8.shaking.KeepReason reason -> b
+    com.android.tools.r8.graph.DexMethod target -> a
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):25:27 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):32:32 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableFieldAction -> com.android.tools.r8.N.I:
+    com.android.tools.r8.graph.DexEncodedField target -> a
+    com.android.tools.r8.shaking.KeepReason reason -> b
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):85:87 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):92:92 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableInterfaceAction -> com.android.tools.r8.N.J:
+    com.android.tools.r8.shaking.KeepReason reason -> b
+    com.android.tools.r8.graph.DexMethod target -> a
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):55:57 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):62:62 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableSuperAction -> com.android.tools.r8.N.K:
+    com.android.tools.r8.graph.DexEncodedMethod context -> b
+    com.android.tools.r8.graph.DexMethod target -> a
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):70:72 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):77:77 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableVirtualAction -> com.android.tools.r8.N.L:
+    com.android.tools.r8.shaking.KeepReason reason -> b
+    com.android.tools.r8.graph.DexMethod target -> a
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):40:42 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):47:47 -> a
+com.android.tools.r8.shaking.FilteredClassPath -> com.android.tools.r8.N.N:
     com.android.tools.r8.origin.Origin origin -> c
     com.android.tools.r8.position.Position position -> d
     java.nio.file.Path path -> a
@@ -57618,7 +57987,112 @@
     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.J:
+com.android.tools.r8.shaking.GraphReporter -> com.android.tools.r8.N.P:
+    com.android.tools.r8.graph.AppView appView -> a
+    java.util.Map annotationNodes -> d
+    boolean $assertionsDisabled -> j
+    java.util.Map reasonInfo -> i
+    com.android.tools.r8.shaking.CollectingGraphConsumer verificationGraphConsumer -> c
+    java.util.Map classNodes -> e
+    java.util.Map methodNodes -> f
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> b
+    java.util.Map fieldNodes -> g
+    java.util.Map ruleNodes -> h
+    1:1:void <clinit>():45:45 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):59:59 -> <init>
+    2:16:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):52:66 -> <init>
+    1:21:boolean verifyRootedPath(com.android.tools.r8.graph.DexProgramClass):71:91 -> a
+    22:28:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind reportPrecondition(com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode):96:102 -> a
+    29:31:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):117:119 -> a
+    32:37:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexProgramClass):107:112 -> a
+    32:37:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):120 -> a
+    38:38:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):123:123 -> a
+    39:41:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):138:140 -> a
+    42:47:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexEncodedMethod):128:133 -> a
+    42:47:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):141 -> a
+    48:48:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):144:144 -> a
+    49:51:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):159:161 -> a
+    52:57:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexEncodedField):149:154 -> a
+    52:57:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):162 -> a
+    58:58:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):165:165 -> a
+    59:64:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):203:208 -> a
+    65:70:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):212:217 -> a
+    71:74:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):222:225 -> a
+    75:80:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):223:228 -> a
+    81:88:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):233:240 -> a
+    89:95:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):244:250 -> a
+    96:96:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):249:249 -> a
+    97:103:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):255:261 -> a
+    104:104:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):259:259 -> a
+    105:107:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):266:268 -> a
+    108:112:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):296:300 -> a
+    113:113:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):362:362 -> a
+    113:113:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):300 -> a
+    114:115:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):300:301 -> a
+    116:119:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):313:316 -> a
+    120:123:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):320:323 -> a
+    124:127:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):327:330 -> a
+    128:129:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):357:358 -> a
+    128:129:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):330 -> a
+    130:132:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):333:335 -> a
+    133:136:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):339:342 -> a
+    137:137:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):346:346 -> a
+    138:138:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):362:362 -> a
+    138:138:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):347 -> a
+    139:139:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):349:349 -> a
+    140:140:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.shaking.KeepReason):379:379 -> a
+    140:140:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):350 -> a
+    141:143:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):351:353 -> a
+    144:153:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):366:375 -> a
+    154:154:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):383:383 -> a
+    155:155:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode getAnnotationGraphNode(com.android.tools.r8.graph.DexItem):387:387 -> a
+    156:160:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$1(com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):390:394 -> a
+    161:161:com.android.tools.r8.experimental.graphinfo.ClassGraphNode getClassGraphNode(com.android.tools.r8.graph.DexType):399:399 -> a
+    162:162:com.android.tools.r8.experimental.graphinfo.MethodGraphNode getMethodGraphNode(com.android.tools.r8.graph.DexMethod):410:410 -> a
+    163:165:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):413:415 -> a
+    166:166:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    166:166:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):416 -> a
+    167:170:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):416:419 -> a
+    171:171:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    171:171:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):421 -> a
+    172:177:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):421:426 -> a
+    178:178:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    178:178:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):426 -> a
+    179:179:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):426:426 -> a
+    180:180:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):420:420 -> a
+    181:181:com.android.tools.r8.experimental.graphinfo.FieldGraphNode getFieldGraphNode(com.android.tools.r8.graph.DexField):431:431 -> a
+    182:184:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):434:436 -> a
+    185:185:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    185:185:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):438 -> a
+    186:187:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):438:439 -> a
+    188:188:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    188:188:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):440 -> a
+    189:189:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):440:440 -> a
+    190:190:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):437:437 -> a
+    191:211:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode getKeepRuleGraphNode(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):453:473 -> a
+    212:212:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$5(com.android.tools.r8.shaking.ProguardKeepRuleBase,java.util.Set,com.android.tools.r8.shaking.ProguardKeepRuleBase):458:458 -> a
+    213:217:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$6(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardKeepRuleBase):466:470 -> a
+    1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):192:195 -> b
+    5:10:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):193:198 -> b
+    11:15:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):305:309 -> b
+    16:16:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo lambda$getEdgeInfo$0(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):383:383 -> b
+    17:19:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):402:404 -> b
+    20:20:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> b
+    20:20:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):405 -> b
+    21:21:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):405:405 -> b
+    1:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):170:171 -> c
+    3:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> c
+    3:3:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):171 -> c
+    4:8:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):171:175 -> c
+    9:14:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):173:178 -> c
+com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness -> com.android.tools.r8.N.O:
+    com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness INSTANCE -> a
+    1:1:void <clinit>():278:278 -> <clinit>
+    1:1:void <init>():280:280 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():286:286 -> a
+    2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):291:291 -> a
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness access$000():276:276 -> c
+com.android.tools.r8.shaking.IfRuleClassPartEquivalence -> com.android.tools.r8.N.Q:
     1:1:void <init>():11:11 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):11:11 -> a
     2:22:boolean doEquivalent(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardIfRule):15:35 -> a
@@ -57626,7 +58100,7 @@
     23:23:int doHash(java.lang.Object):11:11 -> a
     24:41:int doHash(com.android.tools.r8.shaking.ProguardIfRule):43:60 -> a
     24:41:int doHash(java.lang.Object):11 -> a
-com.android.tools.r8.shaking.IfRuleEvaluator -> com.android.tools.r8.N.K:
+com.android.tools.r8.shaking.IfRuleEvaluator -> com.android.tools.r8.N.S:
     java.util.Set liveTypes -> g
     com.android.tools.r8.shaking.RootSetBuilder rootSetBuilder -> i
     com.android.tools.r8.graph.AppView appView -> a
@@ -57675,7 +58149,7 @@
     203:204:boolean lambda$evaluateIfRuleMembersAndMaterialize$4(java.util.Collection,java.util.Collection,com.android.tools.r8.shaking.ProguardMemberRule):280:281 -> a
     205:230:void materializeIfRule(com.android.tools.r8.shaking.ProguardIfRule,java.util.Set):294:319 -> a
     1:5:void registerClassCapture(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):179:183 -> b
-com.android.tools.r8.shaking.InlineRule -> com.android.tools.r8.N.O:
+com.android.tools.r8.shaking.InlineRule -> com.android.tools.r8.N.W:
     com.android.tools.r8.origin.Origin checkDiscardOrigin -> r
     com.android.tools.r8.shaking.InlineRule$Type type -> q
     boolean $assertionsDisabled -> s
@@ -57717,14 +58191,14 @@
     24:24:com.android.tools.r8.shaking.ProguardCheckDiscardRule asProguardCheckDiscardRule():95:95 -> v
     1:1:com.android.tools.r8.shaking.InlineRule$Type getType():78:78 -> w
     1:1:com.android.tools.r8.shaking.InlineRule$Builder builder():74:74 -> x
-com.android.tools.r8.shaking.InlineRule$1 -> com.android.tools.r8.N.L:
+com.android.tools.r8.shaking.InlineRule$1 -> com.android.tools.r8.N.T:
     1:1:void <init>(com.android.tools.r8.origin.Origin):13:13 -> <init>
-com.android.tools.r8.shaking.InlineRule$Builder -> com.android.tools.r8.N.M:
+com.android.tools.r8.shaking.InlineRule$Builder -> com.android.tools.r8.N.U:
     com.android.tools.r8.shaking.InlineRule$Type type -> o
     1:1:void <init>(com.android.tools.r8.shaking.InlineRule$1):24:24 -> <init>
     2:2:void <init>():27:27 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.InlineRule$Type -> com.android.tools.r8.N.N:
+com.android.tools.r8.shaking.InlineRule$Type -> com.android.tools.r8.N.V:
     com.android.tools.r8.shaking.InlineRule$Type[] $VALUES -> d
     com.android.tools.r8.shaking.InlineRule$Type NEVER -> c
     com.android.tools.r8.shaking.InlineRule$Type FORCE -> b
@@ -57733,92 +58207,86 @@
     2:2:void <clinit>():20:20 -> <clinit>
     1:1:void <init>(java.lang.String,int):20:20 -> <init>
     1:1:com.android.tools.r8.shaking.InlineRule$Type[] values():20:20 -> a
-com.android.tools.r8.shaking.KeepReason -> com.android.tools.r8.N.e0:
+com.android.tools.r8.shaking.KeepReason -> com.android.tools.r8.N.l0:
     1:1:void <init>():17:17 -> <init>
-    com.android.tools.r8.shaking.KeepReason$InstatiatedIn asInstantiatedIn() -> a
-    com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.Enqueuer) -> a
+    com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind() -> a
+    com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter) -> a
     1:1:com.android.tools.r8.shaking.KeepReason invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):40:40 -> a
     2:2:com.android.tools.r8.shaking.KeepReason fieldReferencedIn(com.android.tools.r8.graph.DexEncodedMethod):52:52 -> a
     3:3:com.android.tools.r8.shaking.KeepReason referencedInAnnotation(com.android.tools.r8.graph.DexItem):56:56 -> a
-    com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind() -> b
+    boolean isDueToReflectiveUse() -> b
     1:1:com.android.tools.r8.shaking.KeepReason invokedFromLambdaCreatedIn(com.android.tools.r8.graph.DexEncodedMethod):44:44 -> b
-    boolean isDueToReflectiveUse() -> c
     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.P:
-com.android.tools.r8.shaking.KeepReason$AnnotatedOn -> com.android.tools.r8.N.Q:
+    1:1:com.android.tools.r8.shaking.KeepReason reflectiveUseIn(com.android.tools.r8.graph.DexEncodedMethod):72:72 -> d
+com.android.tools.r8.shaking.KeepReason$1 -> com.android.tools.r8.N.X:
+com.android.tools.r8.shaking.KeepReason$AnnotatedOn -> com.android.tools.r8.N.Y:
     com.android.tools.r8.graph.DexDefinition holder -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():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:
+    1:1:void <clinit>():261:261 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason$1):261:261 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexDefinition):265:266 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():271:271 -> a
+    2:8:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):276:282 -> a
+com.android.tools.r8.shaking.KeepReason$BasedOnOtherMethod -> com.android.tools.r8.N.Z:
     com.android.tools.r8.graph.DexEncodedMethod method -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):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):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():111:111 -> e
-com.android.tools.r8.shaking.KeepReason$InvokedFrom -> com.android.tools.r8.N.U:
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):79:79 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod):83:84 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):95:95 -> a
+com.android.tools.r8.shaking.KeepReason$InstatiatedIn -> com.android.tools.r8.N.a0:
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):99:99 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):102:102 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):99:99 -> a
+    2:2:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():107:107 -> a
+com.android.tools.r8.shaking.KeepReason$InvokedFrom -> com.android.tools.r8.N.b0:
     boolean $assertionsDisabled -> b
-    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:
+    1:1:void <clinit>():150:150 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):150:150 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):153:154 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():159:159 -> a
+com.android.tools.r8.shaking.KeepReason$InvokedFromLambdaCreatedIn -> com.android.tools.r8.N.c0:
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):168:168 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):171:171 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():176:176 -> a
+com.android.tools.r8.shaking.KeepReason$InvokedViaSuper -> com.android.tools.r8.N.d0:
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):116:116 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):119:119 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():124:124 -> a
+com.android.tools.r8.shaking.KeepReason$IsLibraryMethod -> com.android.tools.r8.N.e0:
     com.android.tools.r8.graph.DexType implementer -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason$1):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):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):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.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason$1):221:221 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):226:227 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():233:233 -> a
+    2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):238:238 -> a
+com.android.tools.r8.shaking.KeepReason$MethodHandleReferencedFrom -> com.android.tools.r8.N.f0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):309:309 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):312:312 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():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):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:
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():317:317 -> a
+com.android.tools.r8.shaking.KeepReason$ReachableFromLiveType -> com.android.tools.r8.N.g0:
+    com.android.tools.r8.graph.DexType type -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason$1):202:202 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexType):206:207 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():212:212 -> a
+    2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):217:217 -> a
+com.android.tools.r8.shaking.KeepReason$ReferencedFrom -> com.android.tools.r8.N.h0:
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):185:185 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):188:188 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():193:193 -> a
+com.android.tools.r8.shaking.KeepReason$ReferencedInAnnotation -> com.android.tools.r8.N.i0:
+    com.android.tools.r8.graph.DexItem holder -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItem,com.android.tools.r8.shaking.KeepReason$1):242:242 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexItem):246:247 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():252:252 -> a
+    2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):257:257 -> a
+com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom -> com.android.tools.r8.N.j0:
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):287:287 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):290:290 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():300:300 -> a
+    boolean isDueToReflectiveUse() -> b
+com.android.tools.r8.shaking.KeepReason$TargetedBySuper -> com.android.tools.r8.N.k0:
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):133:133 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):136:136 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():141:141 -> a
+com.android.tools.r8.shaking.L8TreePruner -> com.android.tools.r8.N.m0:
     java.util.List pruned -> c
     java.util.Set emulatedInterfaces -> a
     java.util.Set backports -> b
@@ -57830,7 +58298,7 @@
     9:21:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):48 -> a
     22:22:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):51:51 -> a
     23:31:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):49:57 -> a
-com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis -> com.android.tools.r8.N.h0:
+com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis -> com.android.tools.r8.N.o0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap escapeDebuggingCounters -> c
     java.util.Set nonEscapingClassesWithLibraryMethodOverrides -> b
@@ -57863,7 +58331,7 @@
     6:10:void logResults():159:163 -> b
     11:18:void logResults():160:167 -> b
     19:25:void logResults():164:170 -> b
-com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration -> com.android.tools.r8.N.g0:
+com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration -> com.android.tools.r8.N.n0:
     com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration INSTANCE -> a
     1:1:void <clinit>():181:181 -> <clinit>
     1:1:void <init>():184:184 -> <init>
@@ -57871,7 +58339,7 @@
     2:2:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):196:196 -> a
     3:14:boolean isTrivialInitializerInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):209:220 -> a
     3:14:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):197 -> a
-com.android.tools.r8.shaking.MainDexClasses -> com.android.tools.r8.N.k0:
+com.android.tools.r8.shaking.MainDexClasses -> com.android.tools.r8.N.r0:
     java.util.Set classes -> c
     boolean $assertionsDisabled -> e
     java.util.Set roots -> a
@@ -57895,8 +58363,8 @@
     1:1:java.util.Set getDependencies():87:87 -> b
     1:1:java.util.Set getRoots():83:83 -> c
     1:2:boolean isEmpty():78:79 -> d
-com.android.tools.r8.shaking.MainDexClasses$1 -> com.android.tools.r8.N.i0:
-com.android.tools.r8.shaking.MainDexClasses$Builder -> com.android.tools.r8.N.j0:
+com.android.tools.r8.shaking.MainDexClasses$1 -> com.android.tools.r8.N.p0:
+com.android.tools.r8.shaking.MainDexClasses$Builder -> com.android.tools.r8.N.q0:
     java.util.Set dependencies -> c
     java.util.Set roots -> b
     com.android.tools.r8.graph.AppInfo appInfo -> a
@@ -57916,7 +58384,7 @@
     4:5:com.android.tools.r8.shaking.MainDexClasses$Builder addRoot(com.android.tools.r8.graph.DexType):32:33 -> b
     1:1:boolean contains(com.android.tools.r8.graph.DexType):50:50 -> c
     1:2:boolean isProgramClass(com.android.tools.r8.graph.DexType):58:59 -> d
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r8.N.p0:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r8.N.w0:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector codeDirectReferenceCollector -> b
     java.util.function.Consumer consumer -> d
     com.android.tools.r8.graph.AppInfoWithSubtyping appInfo -> c
@@ -57939,8 +58407,8 @@
     20:20:boolean hasReferencesOutsideFromCode(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):81:81 -> a
     21:25:void lambda$hasReferencesOutsideFromCode$2(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$BooleanBox,com.android.tools.r8.graph.DexType):71:75 -> a
     26:29:void traceMethodDirectDependencies(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):89:92 -> a
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1 -> com.android.tools.r8.N.l0:
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.N.m0:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1 -> com.android.tools.r8.N.s0:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.N.t0:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> a
     1:1:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer):172:172 -> <init>
     2:2:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):172:172 -> <init>
@@ -57952,11 +58420,11 @@
     1:2:boolean addField(com.android.tools.r8.graph.DexField):182:183 -> b
     3:4:boolean addMethod(com.android.tools.r8.graph.DexMethod):189:190 -> b
     5:5:boolean addType(com.android.tools.r8.graph.DexType):210:210 -> b
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$BooleanBox -> com.android.tools.r8.N.n0:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$BooleanBox -> com.android.tools.r8.N.u0:
     boolean value -> a
     1:2:void <init>():59:60 -> <init>
     3:3:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):59:59 -> <init>
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> com.android.tools.r8.N.o0:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> com.android.tools.r8.N.v0:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> c
     1:1:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):96:96 -> <init>
     2:3:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.DexItemFactory):98:99 -> <init>
@@ -57973,7 +58441,7 @@
     1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):104:104 -> e
     2:3:boolean registerFieldAccess(com.android.tools.r8.graph.DexField):154:155 -> e
     1:2:boolean registerInvoke(com.android.tools.r8.graph.DexMethod):128:129 -> f
-com.android.tools.r8.shaking.MainDexListBuilder -> com.android.tools.r8.N.q0:
+com.android.tools.r8.shaking.MainDexListBuilder -> com.android.tools.r8.N.x0:
     java.util.Map annotationTypeContainEnum -> c
     com.android.tools.r8.graph.AppInfoWithSubtyping appInfo -> b
     boolean $assertionsDisabled -> f
@@ -58023,29 +58491,29 @@
     14:14:void traceRuntimeAnnotationsWithEnumForMainDex():78:78 -> c
     15:37:void com.android.tools.r8.graph.DexClass.forEachAnnotation(java.util.function.Consumer):359:381 -> c
     15:37:void traceRuntimeAnnotationsWithEnumForMainDex():78 -> c
-com.android.tools.r8.shaking.MemberValuePropagationRule -> com.android.tools.r8.N.u0:
+com.android.tools.r8.shaking.MemberValuePropagationRule -> com.android.tools.r8.N.B0:
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type type -> q
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.shaking.MemberValuePropagationRule$1):11:11 -> <init>
     2:5:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.MemberValuePropagationRule$Type):61:64 -> <init>
     1:5:java.lang.String typeString():77:81 -> u
     1:1:com.android.tools.r8.shaking.MemberValuePropagationRule$Type getType():72:72 -> v
     1:1:com.android.tools.r8.shaking.MemberValuePropagationRule$Builder builder():68:68 -> w
-com.android.tools.r8.shaking.MemberValuePropagationRule$1 -> com.android.tools.r8.N.r0:
+com.android.tools.r8.shaking.MemberValuePropagationRule$1 -> com.android.tools.r8.N.y0:
     int[] $SwitchMap$com$android$tools$r8$shaking$MemberValuePropagationRule$Type -> a
     1:1:void <clinit>():77:77 -> <clinit>
-com.android.tools.r8.shaking.MemberValuePropagationRule$Builder -> com.android.tools.r8.N.s0:
+com.android.tools.r8.shaking.MemberValuePropagationRule$Builder -> com.android.tools.r8.N.z0:
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type type -> o
     1:1:void <init>(com.android.tools.r8.shaking.MemberValuePropagationRule$1):17:17 -> <init>
     2:2:void <init>():21:21 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.MemberValuePropagationRule$Type -> com.android.tools.r8.N.t0:
+com.android.tools.r8.shaking.MemberValuePropagationRule$Type -> com.android.tools.r8.N.A0:
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type[] $VALUES -> b
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type NEVER -> a
     1:1:void <clinit>():14:14 -> <clinit>
     2:2:void <clinit>():13:13 -> <clinit>
     1:1:void <init>(java.lang.String,int):13:13 -> <init>
     1:1:com.android.tools.r8.shaking.MemberValuePropagationRule$Type[] values():13:13 -> a
-com.android.tools.r8.shaking.ProguardAccessFlags -> com.android.tools.r8.N.v0:
+com.android.tools.r8.shaking.ProguardAccessFlags -> com.android.tools.r8.N.C0:
     java.util.List NAMES -> c
     int PPP_MASK -> b
     int flags -> a
@@ -58096,51 +58564,51 @@
     1:1:void setSynthetic():182:182 -> x
     1:1:void setTransient():150:150 -> y
     1:1:void setVolatile():142:142 -> z
-com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule -> com.android.tools.r8.N.y0:
+com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule -> com.android.tools.r8.N.F0:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     boolean applyToNonProgramClasses() -> p
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder builder():75:75 -> v
-com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1 -> com.android.tools.r8.N.w0:
-com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder -> com.android.tools.r8.N.x0:
+com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1 -> com.android.tools.r8.N.D0:
+com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder -> com.android.tools.r8.N.E0:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule -> com.android.tools.r8.N.B0:
+com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule -> com.android.tools.r8.N.I0:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):46:46 -> <init>
     boolean applyToNonProgramClasses() -> p
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder builder():55:55 -> v
-com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1 -> com.android.tools.r8.N.z0:
-com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder -> com.android.tools.r8.N.A0:
+com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1 -> com.android.tools.r8.N.G0:
+com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder -> com.android.tools.r8.N.H0:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
     1:1:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule build():26:26 -> c
-com.android.tools.r8.shaking.ProguardAssumeValuesRule -> com.android.tools.r8.N.E0:
+com.android.tools.r8.shaking.ProguardAssumeValuesRule -> com.android.tools.r8.N.L0:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardAssumeValuesRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):46:46 -> <init>
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder builder():55:55 -> v
-com.android.tools.r8.shaking.ProguardAssumeValuesRule$1 -> com.android.tools.r8.N.C0:
-com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder -> com.android.tools.r8.N.D0:
+com.android.tools.r8.shaking.ProguardAssumeValuesRule$1 -> com.android.tools.r8.N.J0:
+com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder -> com.android.tools.r8.N.K0:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardAssumeValuesRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardCheckDiscardRule -> com.android.tools.r8.N.H0:
+com.android.tools.r8.shaking.ProguardCheckDiscardRule -> com.android.tools.r8.N.O0:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardCheckDiscardRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):46:46 -> <init>
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder builder():52:52 -> v
-com.android.tools.r8.shaking.ProguardCheckDiscardRule$1 -> com.android.tools.r8.N.F0:
-com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder -> com.android.tools.r8.N.G0:
+com.android.tools.r8.shaking.ProguardCheckDiscardRule$1 -> com.android.tools.r8.N.M0:
+com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder -> com.android.tools.r8.N.N0:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardCheckDiscardRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
     1:1:com.android.tools.r8.shaking.ProguardCheckDiscardRule build():26:26 -> c
-com.android.tools.r8.shaking.ProguardClassFilter -> com.android.tools.r8.N.K0:
+com.android.tools.r8.shaking.ProguardClassFilter -> com.android.tools.r8.N.R0:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList patterns -> a
     1:2:void <clinit>():12:13 -> <clinit>
@@ -58151,15 +58619,15 @@
     4:5:void filterOutMatches(java.util.Set):59:60 -> a
     6:10:void lambda$filterOutMatches$0(java.util.Set,com.android.tools.r8.shaking.ProguardTypeMatcher):61:65 -> a
     1:1:com.android.tools.r8.shaking.ProguardClassFilter$Builder builder():18:18 -> b
-com.android.tools.r8.shaking.ProguardClassFilter$1 -> com.android.tools.r8.N.I0:
-com.android.tools.r8.shaking.ProguardClassFilter$Builder -> com.android.tools.r8.N.J0:
+com.android.tools.r8.shaking.ProguardClassFilter$1 -> com.android.tools.r8.N.P0:
+com.android.tools.r8.shaking.ProguardClassFilter$Builder -> com.android.tools.r8.N.Q0:
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder patterns -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardClassFilter$1):21:21 -> <init>
     2:2:void <init>():24:24 -> <init>
     3:3:void <init>():22:22 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardClassFilter$Builder addPattern(com.android.tools.r8.shaking.ProguardClassNameList):28:28 -> a
     2:2:com.android.tools.r8.shaking.ProguardClassFilter build():33:33 -> a
-com.android.tools.r8.shaking.ProguardClassNameList -> com.android.tools.r8.N.Q0:
+com.android.tools.r8.shaking.ProguardClassNameList -> com.android.tools.r8.N.X0:
     1:1:void <init>():21:21 -> <init>
     java.util.List asSpecificDexTypes() -> a
     void forEachTypeMatcher(java.util.function.Consumer) -> a
@@ -58170,15 +58638,15 @@
     2:2:java.lang.Iterable getWildcardsOrEmpty(com.android.tools.r8.shaking.ProguardClassNameList):91:91 -> a
     java.lang.Iterable getWildcards() -> b
     1:3:java.lang.String toString():71:73 -> toString
-com.android.tools.r8.shaking.ProguardClassNameList$1 -> com.android.tools.r8.N.L0:
-com.android.tools.r8.shaking.ProguardClassNameList$Builder -> com.android.tools.r8.N.M0:
+com.android.tools.r8.shaking.ProguardClassNameList$1 -> com.android.tools.r8.N.S0:
+com.android.tools.r8.shaking.ProguardClassNameList$Builder -> com.android.tools.r8.N.T0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap matchers -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardClassNameList$1):37:37 -> <init>
     2:2:void <init>():44:44 -> <init>
     3:3:void <init>():42:42 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardClassNameList$Builder addClassName(boolean,com.android.tools.r8.shaking.ProguardTypeMatcher):48:48 -> a
     2:9:com.android.tools.r8.shaking.ProguardClassNameList build():53:60 -> a
-com.android.tools.r8.shaking.ProguardClassNameList$MixedClassNameList -> com.android.tools.r8.N.N0:
+com.android.tools.r8.shaking.ProguardClassNameList$MixedClassNameList -> com.android.tools.r8.N.U0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap classNames -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.shaking.ProguardClassNameList$1):279:279 -> <init>
     2:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):283:284 -> <init>
@@ -58195,7 +58663,7 @@
     1:3:java.lang.Iterable getWildcards():342:344 -> b
     1:5:boolean equals(java.lang.Object):312:316 -> equals
     1:1:int hashCode():321:321 -> hashCode
-com.android.tools.r8.shaking.ProguardClassNameList$PositiveClassNameList -> com.android.tools.r8.N.O0:
+com.android.tools.r8.shaking.ProguardClassNameList$PositiveClassNameList -> com.android.tools.r8.N.V0:
     com.android.tools.r8.com.google.common.collect.ImmutableList classNames -> a
     1:1:void <init>(java.util.Collection,com.android.tools.r8.shaking.ProguardClassNameList$1):201:201 -> <init>
     2:3:void <init>(java.util.Collection):205:206 -> <init>
@@ -58212,7 +58680,7 @@
     2:4:java.lang.Iterable getWildcards():259:261 -> b
     1:5:boolean equals(java.lang.Object):231:235 -> equals
     1:1:int hashCode():240:240 -> hashCode
-com.android.tools.r8.shaking.ProguardClassNameList$SingleClassNameList -> com.android.tools.r8.N.P0:
+com.android.tools.r8.shaking.ProguardClassNameList$SingleClassNameList -> com.android.tools.r8.N.W0:
     com.android.tools.r8.shaking.ProguardTypeMatcher className -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardClassNameList$1):139:139 -> <init>
     2:3:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher):143:144 -> <init>
@@ -58225,7 +58693,7 @@
     1:1:java.lang.Iterable getWildcards():187:187 -> b
     1:5:boolean equals(java.lang.Object):162:166 -> equals
     1:1:int hashCode():171:171 -> hashCode
-com.android.tools.r8.shaking.ProguardClassSpecification -> com.android.tools.r8.N.S0:
+com.android.tools.r8.shaking.ProguardClassSpecification -> com.android.tools.r8.N.Z0:
     com.android.tools.r8.shaking.ProguardTypeMatcher inheritanceClassName -> k
     boolean $assertionsDisabled -> n
     com.android.tools.r8.shaking.ProguardClassType classType -> h
@@ -58263,7 +58731,7 @@
     1:1:java.lang.String getSource():228:228 -> n
     1:1:boolean hasInheritanceClassName():244:244 -> o
     1:1:java.lang.String toString():374:374 -> toString
-com.android.tools.r8.shaking.ProguardClassSpecification$Builder -> com.android.tools.r8.N.R0:
+com.android.tools.r8.shaking.ProguardClassSpecification$Builder -> com.android.tools.r8.N.Y0:
     com.android.tools.r8.shaking.ProguardClassType classType -> i
     com.android.tools.r8.shaking.ProguardTypeMatcher inheritanceAnnotation -> k
     boolean inheritanceIsExtends -> m
@@ -58284,7 +58752,7 @@
     1:7:com.android.tools.r8.position.Position getPosition():70:76 -> a
     8:8:com.android.tools.r8.position.Position getPosition():74:74 -> a
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardClassType -> com.android.tools.r8.N.Y0:
+com.android.tools.r8.shaking.ProguardClassType -> com.android.tools.r8.N.f1:
     com.android.tools.r8.shaking.ProguardClassType ANNOTATION_INTERFACE -> a
     com.android.tools.r8.shaking.ProguardClassType CLASS -> b
     com.android.tools.r8.shaking.ProguardClassType UNSPECIFIED -> e
@@ -58297,22 +58765,22 @@
     2:2:void <init>(java.lang.String,int,com.android.tools.r8.shaking.ProguardClassType$1):9:9 -> <init>
     boolean matches(com.android.tools.r8.graph.DexClass) -> a
     1:9:java.lang.String toString():43:51 -> toString
-com.android.tools.r8.shaking.ProguardClassType$1 -> com.android.tools.r8.N.T0:
+com.android.tools.r8.shaking.ProguardClassType$1 -> com.android.tools.r8.N.a1:
     1:1:void <init>(java.lang.String,int):10:10 -> <init>
     1:1:boolean matches(com.android.tools.r8.graph.DexClass):13:13 -> a
-com.android.tools.r8.shaking.ProguardClassType$2 -> com.android.tools.r8.N.U0:
+com.android.tools.r8.shaking.ProguardClassType$2 -> com.android.tools.r8.N.b1:
     1:1:void <init>(java.lang.String,int):16:16 -> <init>
     boolean matches(com.android.tools.r8.graph.DexClass) -> a
-com.android.tools.r8.shaking.ProguardClassType$3 -> com.android.tools.r8.N.V0:
+com.android.tools.r8.shaking.ProguardClassType$3 -> com.android.tools.r8.N.c1:
     1:1:void <init>(java.lang.String,int):22:22 -> <init>
     1:1:boolean matches(com.android.tools.r8.graph.DexClass):25:25 -> a
-com.android.tools.r8.shaking.ProguardClassType$4 -> com.android.tools.r8.N.W0:
+com.android.tools.r8.shaking.ProguardClassType$4 -> com.android.tools.r8.N.d1:
     1:1:void <init>(java.lang.String,int):28:28 -> <init>
     1:1:boolean matches(com.android.tools.r8.graph.DexClass):31:31 -> a
-com.android.tools.r8.shaking.ProguardClassType$5 -> com.android.tools.r8.N.X0:
+com.android.tools.r8.shaking.ProguardClassType$5 -> com.android.tools.r8.N.e1:
     1:1:void <init>(java.lang.String,int):34:34 -> <init>
     boolean matches(com.android.tools.r8.graph.DexClass) -> a
-com.android.tools.r8.shaking.ProguardConfiguration -> com.android.tools.r8.N.a1:
+com.android.tools.r8.shaking.ProguardConfiguration -> com.android.tools.r8.N.h1:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.lang.String packagePrefix -> f
     boolean optimizing -> i
@@ -58393,8 +58861,8 @@
     1:1:boolean hasApplyMappingFile():543:543 -> x
     1:1:boolean hasDontUseMixedCaseClassnames():659:659 -> y
     1:1:boolean isAccessModificationAllowed():531:531 -> z
-com.android.tools.r8.shaking.ProguardConfiguration$1 -> com.android.tools.r8.N.Z0:
-com.android.tools.r8.shaking.ProguardConfiguration$Builder -> com.android.tools.r8.N.a1$a:
+com.android.tools.r8.shaking.ProguardConfiguration$1 -> com.android.tools.r8.N.g1:
+com.android.tools.r8.shaking.ProguardConfiguration$Builder -> com.android.tools.r8.N.h1$a:
     java.lang.String packagePrefix -> f
     java.nio.file.Path classObfuscationDictionary -> D
     boolean overloadAggressively -> N
@@ -58518,7 +58986,7 @@
     1:10:void synthesizeKeepRulesForRecompilation():296:305 -> n
     11:11:void synthesizeKeepRulesForRecompilation():302:302 -> n
     12:12:void synthesizeKeepRulesForRecompilation():301:301 -> n
-com.android.tools.r8.shaking.ProguardConfigurationParser -> com.android.tools.r8.N.f1:
+com.android.tools.r8.shaking.ProguardConfigurationParser -> com.android.tools.r8.N.m1:
     com.android.tools.r8.shaking.ProguardConfiguration$Builder configurationBuilder -> a
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.utils.Reporter reporter -> c
@@ -58563,24 +59031,24 @@
     1:1:java.util.List access$700():46:46 -> i
     1:1:java.util.List access$800():46:46 -> j
     1:1:java.util.List access$900():46:46 -> k
-com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards -> com.android.tools.r8.N.b1:
+com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards -> com.android.tools.r8.N.i1:
     java.util.List wildcards -> b
     java.lang.String pattern -> a
     1:3:void <init>(java.lang.String,java.util.List):2024:2026 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards withoutWildcards(java.lang.String):2030:2030 -> a
     2:3:boolean hasBackreference():2038:2039 -> a
     1:15:boolean hasUnusualCharacters():2043:2057 -> b
-com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation -> com.android.tools.r8.N.c1:
+com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation -> com.android.tools.r8.N.j1:
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards patternWithWildcards -> a
     boolean negated -> b
     1:3:void <init>(java.lang.String,java.util.List,boolean):2068:2070 -> <init>
-com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType -> com.android.tools.r8.N.d1:
+com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType -> com.android.tools.r8.N.k1:
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType CLASS_NAME -> b
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType PACKAGE_NAME -> a
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType ANY -> c
     1:3:void <clinit>():191:193 -> <clinit>
     1:1:void <init>(java.lang.String,int):190:190 -> <init>
-com.android.tools.r8.shaking.ProguardConfigurationParser$ProguardConfigurationSourceParser -> com.android.tools.r8.N.e1:
+com.android.tools.r8.shaking.ProguardConfigurationParser$ProguardConfigurationSourceParser -> com.android.tools.r8.N.l1:
     java.util.function.Predicate PACKAGE_NAME_PREDICATE -> j
     java.nio.file.Path baseDirectory -> g
     boolean $assertionsDisabled -> l
@@ -58911,7 +59379,7 @@
     477:477:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
     477:477:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
     477:477:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
-    478:478:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    478:478:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     478:478:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1209 -> a
     478:478:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
     478:478:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
@@ -59021,15 +59489,13 @@
     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):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
+    16:19:boolean hasNextChar(char):1472:1475 -> d
+    20:20:char acceptQuoteIfPresent():1499:1499 -> d
+    21:24:boolean hasNextChar(java.util.function.Predicate):1479:1482 -> d
+    21:24:char acceptQuoteIfPresent():1499 -> d
+    25:25:char readChar():1524:1524 -> d
+    25:25:char acceptQuoteIfPresent():1499 -> d
+    26:29:boolean lambda$new$6(java.lang.Integer):1583:1586 -> d
     boolean isQuote(char) -> e
     1:7:boolean skipOptionWithOptionalSingleArg(java.lang.String):569:575 -> e
     8:9:boolean lambda$parseFileFilter$2(java.lang.Integer):1388:1389 -> e
@@ -59598,7 +60064,7 @@
     1:6:void skipWhitespace():1432:1437 -> x
     7:14:void skipComment():1443:1450 -> x
     7:14:void skipWhitespace():1439 -> x
-com.android.tools.r8.shaking.ProguardConfigurationRule -> com.android.tools.r8.N.g1:
+com.android.tools.r8.shaking.ProguardConfigurationRule -> com.android.tools.r8.N.n1:
     boolean used -> o
     boolean $assertionsDisabled -> p
     1:1:void <clinit>():21:21 -> <clinit>
@@ -59620,9 +60086,9 @@
     1:1:void markAsUsed():49:49 -> s
     java.lang.String modifierString() -> t
     java.lang.String typeString() -> u
-com.android.tools.r8.shaking.ProguardConfigurationSource -> com.android.tools.r8.N.h1:
+com.android.tools.r8.shaking.ProguardConfigurationSource -> com.android.tools.r8.N.o1:
     java.nio.file.Path getBaseDirectory() -> a
-com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.tools.r8.N.i1:
+com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.tools.r8.N.p1:
     byte[] bytes -> a
     com.android.tools.r8.origin.Origin origin -> b
     1:3:void <init>(byte[],com.android.tools.r8.origin.Origin):18:20 -> <init>
@@ -59630,14 +60096,14 @@
     1:1:java.lang.String get():29:29 -> get
     1:1:java.lang.String getName():40:40 -> getName
     1:1:com.android.tools.r8.origin.Origin getOrigin():45:45 -> getOrigin
-com.android.tools.r8.shaking.ProguardConfigurationSourceFile -> com.android.tools.r8.N.j1:
+com.android.tools.r8.shaking.ProguardConfigurationSourceFile -> com.android.tools.r8.N.q1:
     java.nio.file.Path path -> a
     1:2:void <init>(java.nio.file.Path):18:19 -> <init>
     1:5:java.nio.file.Path getBaseDirectory():29:33 -> a
     1:1:java.lang.String get():24:24 -> get
     1:1:java.lang.String getName():40:40 -> getName
     1:1:com.android.tools.r8.origin.Origin getOrigin():45:45 -> getOrigin
-com.android.tools.r8.shaking.ProguardConfigurationSourceStrings -> com.android.tools.r8.N.k1:
+com.android.tools.r8.shaking.ProguardConfigurationSourceStrings -> com.android.tools.r8.N.r1:
     java.util.List config -> b
     com.android.tools.r8.origin.Origin origin -> c
     java.nio.file.Path basePath -> a
@@ -59645,7 +60111,7 @@
     1:1:java.nio.file.Path getBaseDirectory():47:47 -> a
     1:1:java.lang.String get():42:42 -> get
     1:1:com.android.tools.r8.origin.Origin getOrigin():57:57 -> getOrigin
-com.android.tools.r8.shaking.ProguardConfigurationUtils -> com.android.tools.r8.N.o1:
+com.android.tools.r8.shaking.ProguardConfigurationUtils -> com.android.tools.r8.N.v1:
     com.android.tools.r8.origin.Origin synthesizedRecompilationOrigin -> a
     1:12:void <clinit>():19:30 -> <clinit>
     1:14:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):90:103 -> a
@@ -59654,7 +60120,7 @@
     16:16:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):104:104 -> a
     17:17:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):130:130 -> a
     17:17:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):105 -> a
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     18:18:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):108 -> a
     19:19:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.create(com.android.tools.r8.graph.DexType):101:101 -> a
     19:19:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):108 -> a
@@ -59671,7 +60137,7 @@
     36:36:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):109 -> a
     37:37:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):120:120 -> a
     38:50:boolean hasExplicitAssumeValuesOrAssumeNoSideEffectsRuleForMinSdk(com.android.tools.r8.graph.DexItemFactory,java.util.List):129:141 -> a
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     51:51:boolean hasExplicitAssumeValuesOrAssumeNoSideEffectsRuleForMinSdk(com.android.tools.r8.graph.DexItemFactory,java.util.List):141 -> a
     52:78:boolean hasExplicitAssumeValuesOrAssumeNoSideEffectsRuleForMinSdk(com.android.tools.r8.graph.DexItemFactory,java.util.List):141:167 -> a
     79:82:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):178:181 -> a
@@ -59685,25 +60151,25 @@
     92:92:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):188 -> a
     93:93:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):189:189 -> a
     94:94:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):180:180 -> a
-com.android.tools.r8.shaking.ProguardConfigurationUtils$1 -> com.android.tools.r8.N.l1:
+com.android.tools.r8.shaking.ProguardConfigurationUtils$1 -> com.android.tools.r8.N.s1:
     1:1:void <init>(com.android.tools.r8.origin.Origin):22:22 -> <init>
-com.android.tools.r8.shaking.ProguardConfigurationUtils$2 -> com.android.tools.r8.N.m1:
+com.android.tools.r8.shaking.ProguardConfigurationUtils$2 -> com.android.tools.r8.N.t1:
     1:1:void <init>(com.android.tools.r8.origin.Origin):30:30 -> <init>
-com.android.tools.r8.shaking.ProguardConfigurationUtils$3 -> com.android.tools.r8.N.n1:
+com.android.tools.r8.shaking.ProguardConfigurationUtils$3 -> com.android.tools.r8.N.u1:
     com.android.tools.r8.utils.AndroidApiLevel val$apiLevel -> e
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.AndroidApiLevel):91:91 -> <init>
     1:1:java.lang.String part():94:94 -> part
-com.android.tools.r8.shaking.ProguardIdentifierNameStringRule -> com.android.tools.r8.N.r1:
+com.android.tools.r8.shaking.ProguardIdentifierNameStringRule -> com.android.tools.r8.N.y1:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):45:45 -> <init>
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder builder():51:51 -> v
-com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1 -> com.android.tools.r8.N.p1:
-com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder -> com.android.tools.r8.N.q1:
+com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1 -> com.android.tools.r8.N.w1:
+com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder -> com.android.tools.r8.N.x1:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1):12:12 -> <init>
     2:2:void <init>():15:15 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardIfRule -> com.android.tools.r8.N.u1:
+com.android.tools.r8.shaking.ProguardIfRule -> com.android.tools.r8.N.B1:
     com.android.tools.r8.shaking.ProguardKeepRule subsequentRule -> t
     java.util.Set preconditions -> s
     com.android.tools.r8.origin.Origin neverInlineOrigin -> u
@@ -59727,16 +60193,16 @@
     java.lang.String typeString() -> u
     1:1:java.util.Set getPreconditions():30:30 -> x
     1:1:com.android.tools.r8.shaking.ProguardIfRule$Builder builder():97:97 -> y
-com.android.tools.r8.shaking.ProguardIfRule$1 -> com.android.tools.r8.N.s1:
+com.android.tools.r8.shaking.ProguardIfRule$1 -> com.android.tools.r8.N.z1:
     1:1:void <init>(com.android.tools.r8.origin.Origin):19:19 -> <init>
-com.android.tools.r8.shaking.ProguardIfRule$Builder -> com.android.tools.r8.N.t1:
+com.android.tools.r8.shaking.ProguardIfRule$Builder -> com.android.tools.r8.N.A1:
     com.android.tools.r8.shaking.ProguardKeepRule subsequentRule -> q
     boolean $assertionsDisabled -> r
     1:1:void <clinit>():33:33 -> <clinit>
     1:1:void <init>():38:38 -> <init>
     2:2:void <init>():35:35 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardKeepAttributes -> com.android.tools.r8.N.v1:
+com.android.tools.r8.shaking.ProguardKeepAttributes -> com.android.tools.r8.N.C1:
     boolean runtimeInvisibleAnnotations -> m
     boolean runtimeVisibleParameterAnnotations -> n
     boolean runtimeInvisibleParameterAnnotations -> o
@@ -59769,7 +60235,7 @@
     1:5:boolean equals(java.lang.Object):176:180 -> equals
     1:16:int hashCode():200:215 -> hashCode
     1:1:java.lang.String toString():298:298 -> toString
-com.android.tools.r8.shaking.ProguardKeepRule -> com.android.tools.r8.N.y1:
+com.android.tools.r8.shaking.ProguardKeepRule -> com.android.tools.r8.N.F1:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardKeepRuleType,com.android.tools.r8.shaking.ProguardKeepRuleModifiers):50:50 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardKeepRule$Builder builder():59:59 -> a
     1:1:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):116 -> a
@@ -59804,13 +60270,13 @@
     44:51:void appendNonEmpty(java.lang.StringBuilder,java.lang.String,java.lang.Object,java.lang.String):102:109 -> a
     1:5:boolean equals(java.lang.Object):91:95 -> equals
     1:1:com.android.tools.r8.shaking.ProguardKeepRule$Builder builder():59:59 -> x
-com.android.tools.r8.shaking.ProguardKeepRule$1 -> com.android.tools.r8.N.w1:
+com.android.tools.r8.shaking.ProguardKeepRule$1 -> com.android.tools.r8.N.D1:
     1:1:void <init>(com.android.tools.r8.origin.Origin):118:118 -> <init>
-com.android.tools.r8.shaking.ProguardKeepRule$Builder -> com.android.tools.r8.N.x1:
+com.android.tools.r8.shaking.ProguardKeepRule$Builder -> com.android.tools.r8.N.E1:
     1:1:void <init>():18:18 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
     1:3:com.android.tools.r8.shaking.ProguardKeepRule build():28:30 -> c
-com.android.tools.r8.shaking.ProguardKeepRuleBase -> com.android.tools.r8.N.A1:
+com.android.tools.r8.shaking.ProguardKeepRuleBase -> com.android.tools.r8.N.H1:
     com.android.tools.r8.shaking.ProguardKeepRuleModifiers modifiers -> r
     com.android.tools.r8.shaking.ProguardKeepRuleType type -> q
     1:5:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardKeepRuleType,com.android.tools.r8.shaking.ProguardKeepRuleModifiers):58:62 -> <init>
@@ -59820,13 +60286,13 @@
     1:1:java.lang.String typeString():116:116 -> u
     1:1:com.android.tools.r8.shaking.ProguardKeepRuleModifiers getModifiers():70:70 -> v
     1:1:com.android.tools.r8.shaking.ProguardKeepRuleType getType():66:66 -> w
-com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder -> com.android.tools.r8.N.z1:
+com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder -> com.android.tools.r8.N.G1:
     com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder modifiersBuilder -> p
     com.android.tools.r8.shaking.ProguardKeepRuleType type -> o
     1:1:void <init>():21:21 -> <init>
     2:2:void <init>():18:18 -> <init>
     1:2:com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder setType(com.android.tools.r8.shaking.ProguardKeepRuleType):25:26 -> a
-com.android.tools.r8.shaking.ProguardKeepRuleModifiers -> com.android.tools.r8.N.D1:
+com.android.tools.r8.shaking.ProguardKeepRuleModifiers -> com.android.tools.r8.N.K1:
     boolean allowsShrinking -> a
     boolean allowsOptimization -> b
     boolean allowsObfuscation -> c
@@ -59838,8 +60304,8 @@
     1:6:boolean equals(java.lang.Object):63:68 -> equals
     1:4:int hashCode():76:79 -> hashCode
     1:6:java.lang.String toString():84:89 -> toString
-com.android.tools.r8.shaking.ProguardKeepRuleModifiers$1 -> com.android.tools.r8.N.B1:
-com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder -> com.android.tools.r8.N.C1:
+com.android.tools.r8.shaking.ProguardKeepRuleModifiers$1 -> com.android.tools.r8.N.I1:
+com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder -> com.android.tools.r8.N.J1:
     boolean allowsShrinking -> a
     boolean allowsOptimization -> b
     boolean allowsObfuscation -> c
@@ -59852,7 +60318,7 @@
     1:1:void setAllowsOptimization(boolean):21:21 -> b
     1:1:void setAllowsShrinking(boolean):17:17 -> c
     1:1:void setIncludeDescriptorClasses(boolean):30:30 -> d
-com.android.tools.r8.shaking.ProguardKeepRuleType -> com.android.tools.r8.N.E1:
+com.android.tools.r8.shaking.ProguardKeepRuleType -> com.android.tools.r8.N.L1:
     com.android.tools.r8.shaking.ProguardKeepRuleType[] $VALUES -> e
     com.android.tools.r8.shaking.ProguardKeepRuleType KEEP_CLASS_MEMBERS -> b
     com.android.tools.r8.shaking.ProguardKeepRuleType KEEP_CLASSES_WITH_MEMBERS -> c
@@ -59863,7 +60329,7 @@
     1:1:void <init>(java.lang.String,int):8:8 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardKeepRuleType[] values():8:8 -> a
     1:11:java.lang.String toString():16:26 -> toString
-com.android.tools.r8.shaking.ProguardMemberRule -> com.android.tools.r8.N.H1:
+com.android.tools.r8.shaking.ProguardMemberRule -> com.android.tools.r8.N.O1:
     com.android.tools.r8.shaking.ProguardNameMatcher name -> f
     com.android.tools.r8.shaking.ProguardMemberType ruleType -> d
     com.android.tools.r8.shaking.ProguardTypeMatcher type -> e
@@ -59980,10 +60446,10 @@
     52:52:java.lang.String toString():390 -> toString
     53:53:java.lang.String toString():390:390 -> toString
     54:88:java.lang.String toString():369:403 -> toString
-com.android.tools.r8.shaking.ProguardMemberRule$1 -> com.android.tools.r8.N.F1:
+com.android.tools.r8.shaking.ProguardMemberRule$1 -> com.android.tools.r8.N.M1:
     int[] $SwitchMap$com$android$tools$r8$shaking$ProguardMemberType -> a
     1:1:void <clinit>():174:174 -> <clinit>
-com.android.tools.r8.shaking.ProguardMemberRule$Builder -> com.android.tools.r8.N.G1:
+com.android.tools.r8.shaking.ProguardMemberRule$Builder -> com.android.tools.r8.N.N1:
     com.android.tools.r8.shaking.ProguardNameMatcher name -> f
     boolean $assertionsDisabled -> i
     com.android.tools.r8.shaking.ProguardMemberType ruleType -> d
@@ -60009,7 +60475,7 @@
     1:1:com.android.tools.r8.shaking.ProguardAccessFlags getNegatedAccessFlags():51:51 -> c
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher getTypeMatcher():64:64 -> d
     1:1:boolean isValid():87:87 -> e
-com.android.tools.r8.shaking.ProguardMemberRuleReturnValue -> com.android.tools.r8.N.J1:
+com.android.tools.r8.shaking.ProguardMemberRuleReturnValue -> com.android.tools.r8.N.Q1:
     com.android.tools.r8.utils.LongInterval longInterval -> c
     boolean $assertionsDisabled -> e
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type type -> a
@@ -60029,14 +60495,14 @@
     1:1:boolean isSingleValue():78:78 -> g
     1:1:boolean isValueRange():56:56 -> h
     1:17:java.lang.String toString():111:127 -> toString
-com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type -> com.android.tools.r8.N.I1:
+com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type -> com.android.tools.r8.N.P1:
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type BOOLEAN -> a
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type FIELD -> c
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type VALUE_RANGE -> b
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type NULL -> d
     1:4:void <clinit>():12:15 -> <clinit>
     1:1:void <init>(java.lang.String,int):11:11 -> <init>
-com.android.tools.r8.shaking.ProguardMemberType -> com.android.tools.r8.N.K1:
+com.android.tools.r8.shaking.ProguardMemberType -> com.android.tools.r8.N.R1:
     com.android.tools.r8.shaking.ProguardMemberType METHOD -> h
     com.android.tools.r8.shaking.ProguardMemberType CONSTRUCTOR -> g
     com.android.tools.r8.shaking.ProguardMemberType INIT -> f
@@ -60050,7 +60516,7 @@
     9:9:void <clinit>():6:6 -> <clinit>
     1:1:void <init>(java.lang.String,int):6:6 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardMemberType[] values():6:6 -> a
-com.android.tools.r8.shaking.ProguardNameMatcher -> com.android.tools.r8.N.P1:
+com.android.tools.r8.shaking.ProguardNameMatcher -> com.android.tools.r8.N.W1:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.shaking.ProguardNameMatcher MATCH_ALL_NAMES -> a
     1:3:void <clinit>():14:16 -> <clinit>
@@ -60067,8 +60533,8 @@
     1:43:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):39:81 -> b
     44:66:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):56:78 -> b
     67:111:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):43:87 -> b
-com.android.tools.r8.shaking.ProguardNameMatcher$1 -> com.android.tools.r8.N.L1:
-com.android.tools.r8.shaking.ProguardNameMatcher$MatchAllNames -> com.android.tools.r8.N.M1:
+com.android.tools.r8.shaking.ProguardNameMatcher$1 -> com.android.tools.r8.N.S1:
+com.android.tools.r8.shaking.ProguardNameMatcher$MatchAllNames -> com.android.tools.r8.N.T1:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> c
     1:1:void <init>():108:108 -> <init>
     2:3:void <init>(com.android.tools.r8.shaking.ProguardWildcard):111:112 -> <init>
@@ -60076,7 +60542,7 @@
     2:2:java.lang.Iterable getWildcards():123:123 -> a
     1:1:com.android.tools.r8.shaking.ProguardNameMatcher$MatchAllNames materialize():128:128 -> b
     1:1:com.android.tools.r8.shaking.ProguardNameMatcher materialize():104 -> b
-com.android.tools.r8.shaking.ProguardNameMatcher$MatchNamePattern -> com.android.tools.r8.N.N1:
+com.android.tools.r8.shaking.ProguardNameMatcher$MatchNamePattern -> com.android.tools.r8.N.U1:
     java.util.List wildcards -> d
     java.lang.String pattern -> c
     1:3:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards):142:144 -> <init>
@@ -60087,14 +60553,14 @@
     1:1:boolean equals(java.lang.Object):180:180 -> equals
     1:1:int hashCode():185:185 -> hashCode
     1:1:java.lang.String toString():172:172 -> toString
-com.android.tools.r8.shaking.ProguardNameMatcher$MatchSpecificName -> com.android.tools.r8.N.O1:
+com.android.tools.r8.shaking.ProguardNameMatcher$MatchSpecificName -> com.android.tools.r8.N.V1:
     java.lang.String name -> c
     1:2:void <init>(java.lang.String):193:194 -> <init>
     1:1:boolean matches(java.lang.String):199:199 -> a
     1:1:boolean equals(java.lang.Object):209:209 -> equals
     1:1:int hashCode():214:214 -> hashCode
     1:1:java.lang.String toString():204:204 -> toString
-com.android.tools.r8.shaking.ProguardPackageMatcher -> com.android.tools.r8.N.Q1:
+com.android.tools.r8.shaking.ProguardPackageMatcher -> com.android.tools.r8.N.X1:
     java.lang.String pattern -> a
     1:2:void <init>(java.lang.String):12:13 -> <init>
     1:1:boolean matches(com.android.tools.r8.graph.DexType):17:17 -> a
@@ -60106,7 +60572,7 @@
     57:86:boolean matchPackageNameImpl(java.lang.String,int,java.lang.String,int):44:73 -> a
     1:5:boolean equals(java.lang.Object):85:89 -> equals
     1:1:int hashCode():94:94 -> hashCode
-com.android.tools.r8.shaking.ProguardPackageNameList -> com.android.tools.r8.N.T1:
+com.android.tools.r8.shaking.ProguardPackageNameList -> com.android.tools.r8.N.a2:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap packageNames -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.shaking.ProguardPackageNameList$1):12:12 -> <init>
     2:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):39:40 -> <init>
@@ -60114,15 +60580,15 @@
     2:5:boolean matches(com.android.tools.r8.graph.DexType):60:63 -> a
     1:15:boolean equals(java.lang.Object):74:88 -> equals
     1:6:int hashCode():98:103 -> hashCode
-com.android.tools.r8.shaking.ProguardPackageNameList$1 -> com.android.tools.r8.N.R1:
-com.android.tools.r8.shaking.ProguardPackageNameList$Builder -> com.android.tools.r8.N.S1:
+com.android.tools.r8.shaking.ProguardPackageNameList$1 -> com.android.tools.r8.N.Y1:
+com.android.tools.r8.shaking.ProguardPackageNameList$Builder -> com.android.tools.r8.N.Z1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap matchers -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPackageNameList$1):18:18 -> <init>
     2:2:void <init>():24:24 -> <init>
     3:3:void <init>():21:21 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardPackageNameList$Builder addPackageName(boolean,com.android.tools.r8.shaking.ProguardPackageMatcher):28:28 -> a
     2:2:com.android.tools.r8.shaking.ProguardPackageNameList build():33:33 -> a
-com.android.tools.r8.shaking.ProguardPathFilter -> com.android.tools.r8.N.W1:
+com.android.tools.r8.shaking.ProguardPathFilter -> com.android.tools.r8.N.d2:
     boolean enabled -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList patterns -> b
     boolean $assertionsDisabled -> c
@@ -60132,8 +60598,8 @@
     1:1:boolean isEnabled():55:55 -> a
     2:4:boolean matches(java.lang.String):59:61 -> a
     1:1:com.android.tools.r8.shaking.ProguardPathFilter$Builder builder():14:14 -> b
-com.android.tools.r8.shaking.ProguardPathFilter$1 -> com.android.tools.r8.N.U1:
-com.android.tools.r8.shaking.ProguardPathFilter$Builder -> com.android.tools.r8.N.V1:
+com.android.tools.r8.shaking.ProguardPathFilter$1 -> com.android.tools.r8.N.b2:
+com.android.tools.r8.shaking.ProguardPathFilter$Builder -> com.android.tools.r8.N.c2:
     boolean enabled -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder patterns -> b
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPathFilter$1):17:17 -> <init>
@@ -60143,13 +60609,13 @@
     2:2:com.android.tools.r8.shaking.ProguardPathFilter build():40:40 -> a
     1:1:com.android.tools.r8.shaking.ProguardPathFilter$Builder disable():30:30 -> b
     1:1:com.android.tools.r8.shaking.ProguardPathFilter$Builder enable():35:35 -> c
-com.android.tools.r8.shaking.ProguardPathList -> com.android.tools.r8.N.c2:
+com.android.tools.r8.shaking.ProguardPathList -> com.android.tools.r8.N.j2:
     1:1:void <init>():10:10 -> <init>
     boolean matches(java.lang.String) -> a
     1:1:com.android.tools.r8.shaking.ProguardPathList$Builder builder():13:13 -> a
     1:1:com.android.tools.r8.shaking.ProguardPathList emptyList():17:17 -> b
-com.android.tools.r8.shaking.ProguardPathList$1 -> com.android.tools.r8.N.X1:
-com.android.tools.r8.shaking.ProguardPathList$Builder -> com.android.tools.r8.N.Y1:
+com.android.tools.r8.shaking.ProguardPathList$1 -> com.android.tools.r8.N.e2:
+com.android.tools.r8.shaking.ProguardPathList$Builder -> com.android.tools.r8.N.f2:
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder matchers -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPathList$1):22:22 -> <init>
     2:2:void <init>():26:26 -> <init>
@@ -60158,11 +60624,11 @@
     1:1:com.android.tools.r8.shaking.ProguardPathList$Builder addFileName(java.lang.String):30 -> a
     2:2:com.android.tools.r8.shaking.ProguardPathList$Builder addFileName(java.lang.String,boolean):34:34 -> a
     3:7:com.android.tools.r8.shaking.ProguardPathList build():39:43 -> a
-com.android.tools.r8.shaking.ProguardPathList$EmptyPathList -> com.android.tools.r8.N.Z1:
+com.android.tools.r8.shaking.ProguardPathList$EmptyPathList -> com.android.tools.r8.N.g2:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPathList$1):122:122 -> <init>
     2:2:void <init>():124:124 -> <init>
     boolean matches(java.lang.String) -> a
-com.android.tools.r8.shaking.ProguardPathList$FileNameMatcher -> com.android.tools.r8.N.a2:
+com.android.tools.r8.shaking.ProguardPathList$FileNameMatcher -> com.android.tools.r8.N.h2:
     boolean negated -> a
     java.lang.String pattern -> b
     1:3:void <init>(boolean,java.lang.String):52:54 -> <init>
@@ -60174,12 +60640,12 @@
     34:34:boolean containsSeparatorsStartingAt(java.lang.String,int):98:98 -> a
     34:34:boolean matchImpl(java.lang.String,int,java.lang.String,int):70 -> a
     35:56:boolean matchImpl(java.lang.String,int,java.lang.String,int):73:94 -> a
-com.android.tools.r8.shaking.ProguardPathList$PathList -> com.android.tools.r8.N.b2:
+com.android.tools.r8.shaking.ProguardPathList$PathList -> com.android.tools.r8.N.i2:
     java.util.List matchers -> a
     1:1:void <init>(java.util.List,com.android.tools.r8.shaking.ProguardPathList$1):103:103 -> <init>
     2:3:void <init>(java.util.List):106:107 -> <init>
     1:4:boolean matches(java.lang.String):112:115 -> a
-com.android.tools.r8.shaking.ProguardRuleParserException -> com.android.tools.r8.N.d2:
+com.android.tools.r8.shaking.ProguardRuleParserException -> com.android.tools.r8.N.k2:
     com.android.tools.r8.origin.Origin origin -> c
     com.android.tools.r8.position.Position position -> d
     java.lang.String message -> a
@@ -60189,7 +60655,7 @@
     1:1:java.lang.String getMessage():48:48 -> getMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():33:33 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():38:38 -> getPosition
-com.android.tools.r8.shaking.ProguardTypeMatcher -> com.android.tools.r8.N.m2:
+com.android.tools.r8.shaking.ProguardTypeMatcher -> com.android.tools.r8.N.t2:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher$1):23:23 -> <init>
     2:2:void <init>():31:31 -> <init>
     com.android.tools.r8.graph.DexType getSpecificType() -> a
@@ -60203,19 +60669,19 @@
     27:27:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):86:86 -> a
     28:28:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):84:84 -> a
     29:29:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):82:82 -> a
-    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     30:30:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):93 -> a
     31:34:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):93:96 -> a
     1:1:java.lang.Iterable getWildcards():55:55 -> b
     boolean hasSpecificType() -> c
     boolean isTripleDotPattern() -> d
-com.android.tools.r8.shaking.ProguardTypeMatcher$1 -> com.android.tools.r8.N.e2:
-com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType -> com.android.tools.r8.N.f2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$1 -> com.android.tools.r8.N.l2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType -> com.android.tools.r8.N.m2:
     com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType CLASS -> a
     com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType TYPE -> b
     1:2:void <clinit>():35:36 -> <clinit>
     1:1:void <init>(java.lang.String,int):34:34 -> <init>
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAllTypes -> com.android.tools.r8.N.g2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAllTypes -> com.android.tools.r8.N.n2:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> a
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_ALL_TYPES -> b
     1:1:void <clinit>():128:128 -> <clinit>
@@ -60230,7 +60696,7 @@
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$000():126:126 -> e
     1:1:boolean equals(java.lang.Object):163:163 -> equals
     1:1:int hashCode():168:168 -> hashCode
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAnyArgSequence -> com.android.tools.r8.N.h2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAnyArgSequence -> com.android.tools.r8.N.o2:
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_ANY_ARG_SEQUENCE -> a
     1:1:void <clinit>():174:174 -> <clinit>
     1:1:void <init>():172:172 -> <init>
@@ -60239,7 +60705,7 @@
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$100():172:172 -> e
     1:1:boolean equals(java.lang.Object):193:193 -> equals
     1:1:int hashCode():198:198 -> hashCode
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchBasicTypes -> com.android.tools.r8.N.i2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchBasicTypes -> com.android.tools.r8.N.p2:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> a
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_BASIC_TYPES -> b
     1:1:void <clinit>():259:259 -> <clinit>
@@ -60254,7 +60720,7 @@
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$400():257:257 -> e
     1:1:boolean equals(java.lang.Object):297:297 -> equals
     1:1:int hashCode():302:302 -> hashCode
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchClassTypes -> com.android.tools.r8.N.j2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchClassTypes -> com.android.tools.r8.N.q2:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> b
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_CLASS_TYPES -> c
     boolean $assertionsDisabled -> e
@@ -60277,7 +60743,7 @@
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$300():202:202 -> f
     1:1:int hashCode():253:253 -> hashCode
     1:1:java.lang.String toString():243:243 -> toString
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchSpecificType -> com.android.tools.r8.N.k2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchSpecificType -> com.android.tools.r8.N.r2:
     com.android.tools.r8.graph.DexType type -> a
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardTypeMatcher$1):306:306 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexType):310:311 -> <init>
@@ -60287,7 +60753,7 @@
     1:2:boolean equals(java.lang.Object):326:327 -> equals
     1:1:int hashCode():334:334 -> hashCode
     1:1:java.lang.String toString():321:321 -> toString
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchTypePattern -> com.android.tools.r8.N.l2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchTypePattern -> com.android.tools.r8.N.s2:
     java.util.List wildcards -> b
     java.lang.String pattern -> a
     com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType kind -> c
@@ -60301,7 +60767,7 @@
     22:68:java.lang.String removeMaterializedBackReferencesFromPattern(java.lang.String,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):413:459 -> a
     22:68:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):394 -> a
     69:70:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):395:396 -> a
-    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     71:71:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):397 -> a
     72:82:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):398:408 -> a
     83:174:boolean matchClassOrTypeNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType):470:561 -> a
@@ -60316,17 +60782,17 @@
     1:3:boolean equals(java.lang.Object):589:591 -> equals
     1:1:int hashCode():598:598 -> hashCode
     1:1:java.lang.String toString():584:584 -> toString
-com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule -> com.android.tools.r8.N.p2:
+com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule -> com.android.tools.r8.N.w2:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):46:46 -> <init>
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder builder():52:52 -> v
-com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1 -> com.android.tools.r8.N.n2:
-com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder -> com.android.tools.r8.N.o2:
+com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1 -> com.android.tools.r8.N.u2:
+com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder -> com.android.tools.r8.N.v2:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardWildcard -> com.android.tools.r8.N.s2:
+com.android.tools.r8.shaking.ProguardWildcard -> com.android.tools.r8.N.z2:
     1:1:void <init>():8:8 -> <init>
     com.android.tools.r8.shaking.ProguardWildcard$BackReference asBackReference() -> a
     void setCaptured(java.lang.String) -> a
@@ -60335,7 +60801,7 @@
     boolean isBackReference() -> d
     boolean isPattern() -> e
     com.android.tools.r8.shaking.ProguardWildcard materialize() -> f
-com.android.tools.r8.shaking.ProguardWildcard$BackReference -> com.android.tools.r8.N.q2:
+com.android.tools.r8.shaking.ProguardWildcard$BackReference -> com.android.tools.r8.N.x2:
     int referenceIndex -> b
     com.android.tools.r8.shaking.ProguardWildcard$Pattern reference -> a
     1:2:void <init>(int):85:86 -> <init>
@@ -60350,7 +60816,7 @@
     6:6:com.android.tools.r8.shaking.ProguardWildcard materialize():80 -> f
     1:1:java.lang.String getCaptured():105:105 -> g
     1:1:java.lang.String toString():130:130 -> toString
-com.android.tools.r8.shaking.ProguardWildcard$Pattern -> com.android.tools.r8.N.r2:
+com.android.tools.r8.shaking.ProguardWildcard$Pattern -> com.android.tools.r8.N.y2:
     java.lang.String pattern -> a
     java.lang.String captured -> b
     1:1:void <init>(java.lang.String):35:35 -> <init>
@@ -60359,12 +60825,13 @@
     com.android.tools.r8.shaking.ProguardWildcard$Pattern asPattern() -> b
     1:1:void clearCaptured():46:46 -> c
     boolean isPattern() -> e
-    1:5:com.android.tools.r8.shaking.ProguardWildcard$Pattern materialize():56:60 -> f
-    6:10:com.android.tools.r8.shaking.ProguardWildcard$Pattern materialize():56:60 -> f
-    6:10:com.android.tools.r8.shaking.ProguardWildcard materialize():31 -> f
+    1:1:com.android.tools.r8.shaking.ProguardWildcard materialize():31:31 -> f
+    2:6:com.android.tools.r8.shaking.ProguardWildcard$Pattern materialize():56:60 -> f
+    7:7:void setCaptured(java.lang.String):41:41 -> f
+    7:7:com.android.tools.r8.shaking.ProguardWildcard$Pattern materialize():60 -> f
     1:1:java.lang.String getCaptured():51:51 -> g
     1:1:java.lang.String toString():76:76 -> toString
-com.android.tools.r8.shaking.RootSetBuilder -> com.android.tools.r8.N.v2:
+com.android.tools.r8.shaking.RootSetBuilder -> com.android.tools.r8.N.C2:
     java.util.Set identifierNameStrings -> w
     java.util.Map dependentKeepClassCompatRule -> s
     com.android.tools.r8.graph.AppView appView -> a
@@ -60524,7 +60991,7 @@
     com.android.tools.r8.graph.DexReference lambda$addItemToSets$19(com.android.tools.r8.graph.DexReference) -> e
     1:1:java.util.Map lambda$includeDescriptor$12(com.android.tools.r8.graph.DexReference):816:816 -> f
     1:1:java.util.Set lambda$includeDescriptor$13(com.android.tools.r8.graph.DexReference):817:817 -> g
-com.android.tools.r8.shaking.RootSetBuilder$1 -> com.android.tools.r8.N.t2:
+com.android.tools.r8.shaking.RootSetBuilder$1 -> com.android.tools.r8.N.A2:
     int[] $SwitchMap$com$android$tools$r8$shaking$InlineRule$Type -> b
     int[] $SwitchMap$com$android$tools$r8$shaking$ClassInlineRule$Type -> c
     int[] $SwitchMap$com$android$tools$r8$shaking$ClassMergingRule$Type -> d
@@ -60535,7 +61002,7 @@
     3:3:void <clinit>():964:964 -> <clinit>
     4:4:void <clinit>():942:942 -> <clinit>
     5:5:void <clinit>():139:139 -> <clinit>
-com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet -> com.android.tools.r8.N.u2:
+com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet -> com.android.tools.r8.N.B2:
     java.util.Map noShrinking -> c
     java.util.Set noOptimization -> d
     java.util.Set noObfuscation -> e
@@ -60545,7 +61012,7 @@
     java.util.Map dependentKeepClassCompatRule -> g
     1:1:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.shaking.RootSetBuilder$1):1410:1410 -> <init>
     2:9:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map,java.util.Map):1426:1433 -> <init>
-com.android.tools.r8.shaking.RootSetBuilder$RootSet -> com.android.tools.r8.N.v2$a:
+com.android.tools.r8.shaking.RootSetBuilder$RootSet -> com.android.tools.r8.N.C2$a:
     java.util.Map assumedValues -> q
     java.util.Map dependentNoShrinking -> r
     java.util.Map dependentKeepClassCompatRule -> s
@@ -60632,7 +61099,7 @@
     2:6:boolean verifyKeptTypesAreLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1279:1283 -> c
     7:7:java.util.Set lambda$verifyKeptItemsAreKept$6(com.android.tools.r8.graph.DexType):1323:1323 -> c
     1:21:java.lang.String toString():1385:1405 -> toString
-com.android.tools.r8.shaking.ScopedDexMethodSet -> com.android.tools.r8.N.x2:
+com.android.tools.r8.shaking.ScopedDexMethodSet -> com.android.tools.r8.N.E2:
     java.util.Map items -> b
     com.android.tools.r8.com.google.common.base.Equivalence METHOD_EQUIVALENCE -> c
     com.android.tools.r8.shaking.ScopedDexMethodSet parent -> a
@@ -60650,13 +61117,13 @@
     1:1:com.android.tools.r8.shaking.ScopedDexMethodSet newNestedScope():36:36 -> b
     2:11:com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult addMethodIfMoreVisible(com.android.tools.r8.graph.DexEncodedMethod):58:67 -> b
     12:19:com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult addMethodIfMoreVisible(com.android.tools.r8.graph.DexEncodedMethod):64:71 -> b
-com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult -> com.android.tools.r8.N.w2:
+com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult -> com.android.tools.r8.N.D2:
     com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult ADDED_NOT_EXISTING -> b
     com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult ADDED_MORE_VISIBLE -> c
     com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult NOT_ADDED -> a
     1:3:void <clinit>():17:19 -> <clinit>
     1:1:void <init>(java.lang.String,int):16:16 -> <init>
-com.android.tools.r8.shaking.StaticClassMerger -> com.android.tools.r8.N.B2:
+com.android.tools.r8.shaking.StaticClassMerger -> com.android.tools.r8.N.I2:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> i
     com.android.tools.r8.com.google.common.base.Equivalence fieldEquivalence -> c
@@ -60734,7 +61201,7 @@
     42:42:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):296 -> c
     43:53:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):303:313 -> c
     54:59:boolean lambda$satisfiesMergeCriteria$1(com.android.tools.r8.graph.DexEncodedMethod):288:293 -> c
-com.android.tools.r8.shaking.StaticClassMerger$MergeGroup -> com.android.tools.r8.N.z2:
+com.android.tools.r8.shaking.StaticClassMerger$MergeGroup -> com.android.tools.r8.N.G2:
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup DONT_MERGE -> d
     boolean $assertionsDisabled -> i
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key mainDexDependenciesGlobalKey -> f
@@ -60752,7 +61219,7 @@
     11:11:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key globalKey():117:117 -> a
     12:13:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key key(java.lang.String):126:127 -> a
     1:9:java.lang.String toString():132:140 -> toString
-com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key -> com.android.tools.r8.N.y2:
+com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key -> com.android.tools.r8.N.F2:
     java.lang.String packageOrGlobal -> b
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup mergeGroup -> a
     1:3:void <init>(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup,java.lang.String):77:79 -> <init>
@@ -60761,7 +61228,7 @@
     1:1:boolean isGlobal():91:91 -> c
     1:5:boolean equals(java.lang.Object):104:108 -> equals
     1:1:int hashCode():96:96 -> hashCode
-com.android.tools.r8.shaking.StaticClassMerger$Representative -> com.android.tools.r8.N.A2:
+com.android.tools.r8.shaking.StaticClassMerger$Representative -> com.android.tools.r8.N.H2:
     com.android.tools.r8.shaking.StaticClassMerger this$0 -> d
     com.android.tools.r8.graph.DexProgramClass clazz -> a
     com.android.tools.r8.com.google.common.collect.HashMultiset methodBuckets -> c
@@ -60778,7 +61245,7 @@
     9:9:void include(com.android.tools.r8.graph.DexProgramClass):167 -> a
     10:10:com.android.tools.r8.graph.DexProgramClass access$200(com.android.tools.r8.shaking.StaticClassMerger$Representative):151:151 -> a
     11:15:boolean isFull():183:187 -> a
-com.android.tools.r8.shaking.TreePruner -> com.android.tools.r8.N.C2:
+com.android.tools.r8.shaking.TreePruner -> com.android.tools.r8.N.J2:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set prunedTypes -> d
@@ -60821,17 +61288,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():1060:1060 -> a
+    137:137:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> a
     137:137:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):255 -> a
     138:145:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):255:262 -> a
     146:151:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):259:264 -> a
-    152:152:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1060:1060 -> a
+    152:152:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> a
     152:152:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):264 -> a
     153:175:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):264:286 -> a
-    176:176:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():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:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    176:176:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):666 -> a
     176:176:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):286 -> a
-    177:178:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):672:673 -> a
+    177:178:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):667:668 -> a
     177:178:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):286 -> a
     179:190:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):285:296 -> a
     191:191:boolean lambda$reachableMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedMethod):244:244 -> a
@@ -60840,17 +61307,17 @@
     223:223:java.util.Collection getMethodsToKeepForConfigurationDebugging():337:337 -> a
     1:1:java.util.Collection getRemovedClasses():333:333 -> b
     1:6:com.android.tools.r8.graph.DexApplication run():54:59 -> c
-com.android.tools.r8.shaking.UnusedArgumentRule -> com.android.tools.r8.N.F2:
+com.android.tools.r8.shaking.UnusedArgumentRule -> com.android.tools.r8.N.M2:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.UnusedArgumentRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.UnusedArgumentRule$Builder builder():74:74 -> v
-com.android.tools.r8.shaking.UnusedArgumentRule$1 -> com.android.tools.r8.N.D2:
-com.android.tools.r8.shaking.UnusedArgumentRule$Builder -> com.android.tools.r8.N.E2:
+com.android.tools.r8.shaking.UnusedArgumentRule$1 -> com.android.tools.r8.N.K2:
+com.android.tools.r8.shaking.UnusedArgumentRule$Builder -> com.android.tools.r8.N.L2:
     1:1:void <init>(com.android.tools.r8.shaking.UnusedArgumentRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.UsagePrinter -> com.android.tools.r8.N.H2:
+com.android.tools.r8.shaking.UsagePrinter -> com.android.tools.r8.N.O2:
     com.android.tools.r8.graph.DexProgramClass enclosingClazz -> b
     java.util.function.Consumer consumer -> a
     boolean $assertionsDisabled -> e
@@ -60931,14 +61398,14 @@
     10:10:void append(java.lang.String):26:26 -> b
     10:10:void printClazzPrefixIfNecessary():51 -> b
     11:11:void printClazzPrefixIfNecessary():52:52 -> b
-com.android.tools.r8.shaking.UsagePrinter$NoOpUsagePrinter -> com.android.tools.r8.N.G2:
+com.android.tools.r8.shaking.UsagePrinter$NoOpUsagePrinter -> com.android.tools.r8.N.N2:
     1:1:void <init>():96:96 -> <init>
     void printUnusedClass(com.android.tools.r8.graph.DexProgramClass) -> a
     void printUnusedField(com.android.tools.r8.graph.DexEncodedField) -> a
     void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void visited() -> a
     void visiting(com.android.tools.r8.graph.DexProgramClass) -> b
-com.android.tools.r8.shaking.VerticalClassMerger -> com.android.tools.r8.N.S2:
+com.android.tools.r8.shaking.VerticalClassMerger -> com.android.tools.r8.N.Z2:
     com.android.tools.r8.shaking.AppInfoWithLiveness appInfo -> b
     boolean $assertionsDisabled -> p
     com.android.tools.r8.graph.AppView appView -> c
@@ -60970,7 +61437,7 @@
     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):603:603 -> a
+    67:67:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.isSerializable(com.android.tools.r8.graph.DexType):602:602 -> a
     67:67:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):400 -> a
     68:68:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):400:400 -> a
     69:69:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
@@ -61060,14 +61527,14 @@
     1:1:com.android.tools.r8.shaking.AppInfoWithLiveness access$200(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> k
     1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> l
     1:1:java.util.concurrent.ExecutorService access$900(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> m
-com.android.tools.r8.shaking.VerticalClassMerger$1 -> com.android.tools.r8.N.I2:
+com.android.tools.r8.shaking.VerticalClassMerger$1 -> com.android.tools.r8.N.P2:
     int[] $SwitchMap$com$android$tools$r8$shaking$VerticalClassMerger$Rename -> b
     int[] $SwitchMap$com$android$tools$r8$ir$code$Invoke$Type -> c
     int[] $SwitchMap$com$android$tools$r8$shaking$VerticalClassMerger$AbortReason -> a
     1:1:void <clinit>():1950:1950 -> <clinit>
     2:2:void <clinit>():1379:1379 -> <clinit>
     3:3:void <clinit>():152:152 -> <clinit>
-com.android.tools.r8.shaking.VerticalClassMerger$AbortReason -> com.android.tools.r8.N.J2:
+com.android.tools.r8.shaking.VerticalClassMerger$AbortReason -> com.android.tools.r8.N.Q2:
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason PINNED_SOURCE -> h
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason NO_SIDE_EFFECTS -> g
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason NATIVE_METHOD -> f
@@ -61096,7 +61563,7 @@
     56:56:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):147:147 -> a
     57:57:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):202:202 -> a
     57:57:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):147 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.N.K2:
+com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.N.R2:
     com.android.tools.r8.graph.DexClass source -> a
     com.android.tools.r8.graph.DexClass target -> b
     com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder deferredRenamings -> c
@@ -61128,7 +61595,7 @@
     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():1060:1060 -> a
+    35:35:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> a
     35:35:com.android.tools.r8.graph.PresortedComparable com.android.tools.r8.graph.DexEncodedMethod.getKey():80 -> a
     35:35:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1287 -> a
     36:36:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1287:1287 -> a
@@ -61185,10 +61652,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():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 com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> c
+    112:112:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):666 -> c
     112:112:boolean merge():977 -> c
-    113:114:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):672:673 -> c
+    113:114:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):667:668 -> c
     113:114:boolean merge():977 -> c
     115:115:boolean merge():979:979 -> c
     116:116:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
@@ -61223,7 +61690,7 @@
     343:343:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> c
     343:343:boolean merge():915 -> c
     344:344:boolean lambda$restoreDebuggingState$6(com.android.tools.r8.graph.DexEncodedMethod):1124:1124 -> c
-com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.N.L2:
+com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.N.S2:
     java.util.Map seenPositions -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap sourceProtoCache -> c
     java.util.Collection invokes -> f
@@ -61240,7 +61707,7 @@
     23:24:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1598:1599 -> a
     25:56:int computePositionsFor(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1618:1649 -> a
     1:18:void fillSeenPositions():1591:1608 -> b
-com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.N.M2:
+com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.N.T2:
     com.android.tools.r8.graph.AppView appView -> e
     boolean $assertionsDisabled -> g
     com.android.tools.r8.graph.DexMethod context -> d
@@ -61265,7 +61732,7 @@
     11:17:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1812:1818 -> e
     18:21:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):1827:1830 -> e
     1:12:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1793:1804 -> f
-com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> com.android.tools.r8.N.N2:
+com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> com.android.tools.r8.N.U2:
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> b
     java.util.Set mergeeCandidates -> c
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> d
@@ -61282,7 +61749,7 @@
     33:33:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):588:588 -> a
     34:48:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):612:626 -> a
     49:56:boolean typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):632:639 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$Rename -> com.android.tools.r8.N.O2:
+com.android.tools.r8.shaking.VerticalClassMerger$Rename -> com.android.tools.r8.N.V2:
     com.android.tools.r8.shaking.VerticalClassMerger$Rename[] $VALUES -> d
     com.android.tools.r8.shaking.VerticalClassMerger$Rename IF_NEEDED -> b
     com.android.tools.r8.shaking.VerticalClassMerger$Rename ALWAYS -> a
@@ -61291,7 +61758,7 @@
     4:4:void <clinit>():208:208 -> <clinit>
     1:1:void <init>(java.lang.String,int):208:208 -> <init>
     1:1:com.android.tools.r8.shaking.VerticalClassMerger$Rename[] values():208:208 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLense -> com.android.tools.r8.N.P2:
+com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLense -> com.android.tools.r8.N.W2:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> d
     com.android.tools.r8.graph.DexType target -> c
@@ -61308,7 +61775,7 @@
     3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):1708:1708 -> b
     1:1:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):1742:1742 -> c
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):1737:1737 -> f
-com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.N.Q2:
+com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.N.X2:
     com.android.tools.r8.ir.code.Invoke$Type type -> f
     com.android.tools.r8.graph.DexMethod invocationTarget -> e
     boolean isInterface -> g
@@ -61321,7 +61788,7 @@
     15:15:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):1952:1952 -> a
     1:1:java.util.function.Consumer getRegistryCallback():1949:1949 -> p
     1:10:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():1935:1944 -> q
-com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer -> com.android.tools.r8.N.R2:
+com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer -> com.android.tools.r8.N.Y2:
     com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder lensBuilder -> a
     java.util.Map protoFixupCache -> b
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> c
@@ -61369,7 +61836,7 @@
     57:57:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1504:1504 -> a
     58:58:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1503:1503 -> a
     59:69:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):1519:1529 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses -> com.android.tools.r8.N.S2$a:
+com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses -> com.android.tools.r8.N.Z2$a:
     java.util.Map mergedClasses -> a
     java.util.Map sources -> b
     boolean $assertionsDisabled -> c
@@ -61382,7 +61849,7 @@
     1:2:com.android.tools.r8.graph.DexType getTargetFor(com.android.tools.r8.graph.DexType):109:110 -> b
     1:1:boolean hasBeenMergedIntoSubtype(com.android.tools.r8.graph.DexType):114:114 -> c
     1:1:java.util.List lambda$new$0(com.android.tools.r8.graph.DexType):99:99 -> d
-com.android.tools.r8.shaking.VerticalClassMergerGraphLense -> com.android.tools.r8.N.V2:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLense -> com.android.tools.r8.N.c3:
     boolean $assertionsDisabled -> o
     java.util.Map originalMethodSignaturesForBridges -> n
     java.util.Map contextualVirtualToDirectMethodMaps -> l
@@ -61400,8 +61867,8 @@
     1:1:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):121:121 -> b
     1:7:boolean isContextFreeForMethod(com.android.tools.r8.graph.DexMethod):147:153 -> c
     1:12:java.util.Set lookupMethodInAllContexts(com.android.tools.r8.graph.DexMethod):126:137 -> e
-com.android.tools.r8.shaking.VerticalClassMergerGraphLense$1 -> com.android.tools.r8.N.T2:
-com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder -> com.android.tools.r8.N.U2:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLense$1 -> com.android.tools.r8.N.a3:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder -> com.android.tools.r8.N.b3:
     java.util.Map methodMap -> c
     boolean $assertionsDisabled -> i
     com.android.tools.r8.com.google.common.collect.BiMap fieldMap -> b
@@ -61444,7 +61911,7 @@
     104:117:void merge(com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder):336:349 -> a
     1:1:void markMethodAsMerged(com.android.tools.r8.graph.DexMethod):308:308 -> b
     2:2:void recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):321:321 -> b
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer -> com.android.tools.r8.N.Y2:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer -> com.android.tools.r8.N.f3:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():43:43 -> <clinit>
     1:1:void <init>(com.android.tools.r8.experimental.graphinfo.GraphConsumer):58:58 -> <init>
@@ -61474,7 +61941,7 @@
     32:36:java.lang.String getNodeString(com.android.tools.r8.experimental.graphinfo.GraphNode):230 -> b
     37:43:java.lang.String getNodeString(com.android.tools.r8.experimental.graphinfo.GraphNode):230:236 -> b
     44:44:java.lang.String getNodeString(com.android.tools.r8.experimental.graphinfo.GraphNode):235:235 -> b
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter -> com.android.tools.r8.N.W2:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter -> com.android.tools.r8.N.d3:
     java.io.PrintStream output -> a
     int indentation -> b
     1:1:void <init>(java.io.PrintStream):257:257 -> <init>
@@ -61484,19 +61951,19 @@
     1:2:void indent():268:269 -> b
     3:5:void addReason(java.lang.String):274:276 -> b
     1:3:void startItem(java.lang.String):262:264 -> c
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath -> com.android.tools.r8.N.X2:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath -> com.android.tools.r8.N.e3:
     com.android.tools.r8.experimental.graphinfo.GraphNode node -> a
     com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath path -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():46:46 -> <clinit>
     1:4:void <init>(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath):50:53 -> <init>
-com.android.tools.r8.shaking.WhyAreYouNotInliningRule -> com.android.tools.r8.N.b3:
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule -> com.android.tools.r8.N.i3:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder builder():74:74 -> v
-com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1 -> com.android.tools.r8.N.Z2:
-com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder -> com.android.tools.r8.N.a3:
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1 -> com.android.tools.r8.N.g3:
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder -> com.android.tools.r8.N.h3:
     1:1:void <init>(com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
@@ -61713,27 +62180,31 @@
     1:1:void <init>(java.nio.file.Path):38:38 -> <init>
     2:11:void <init>(java.nio.file.Path):31:40 -> <init>
     1:2:void close(com.android.tools.r8.DiagnosticsHandler):51:52 -> a
-    3:10:void writeDelayed(com.android.tools.r8.DiagnosticsHandler):67:74 -> a
-    3:10:void close(com.android.tools.r8.DiagnosticsHandler):54 -> a
-    11:16:void close(com.android.tools.r8.DiagnosticsHandler):55:60 -> a
-    17:22:void handleIOException(java.io.IOException,com.android.tools.r8.DiagnosticsHandler):100:105 -> a
-    23:23:void addDirectory(java.lang.String,com.android.tools.r8.DiagnosticsHandler):111:111 -> a
-    24:29:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):133:138 -> a
-    30:30:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):137:137 -> a
-    31:40:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):133:142 -> a
-    41:41:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):141:141 -> a
-    42:42:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):139:139 -> a
-    43:43:void addFile(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):148:148 -> a
-    44:47:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):171:174 -> a
-    48:52:void writeNextIfAvailable(com.android.tools.r8.DiagnosticsHandler):160:164 -> a
-    48:52:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):175 -> a
-    53:54:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):178:179 -> a
-    55:55:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):178:178 -> a
-    56:56:java.nio.file.Path getPath():190:190 -> a
+    3:7:void writeDelayed(com.android.tools.r8.DiagnosticsHandler):67:71 -> a
+    3:7:void close(com.android.tools.r8.DiagnosticsHandler):54 -> a
+    8:21:void writeDirectoryNow(java.lang.String,com.android.tools.r8.DiagnosticsHandler):115:128 -> a
+    8:21:void writeDelayed(com.android.tools.r8.DiagnosticsHandler):71 -> a
+    8:21:void close(com.android.tools.r8.DiagnosticsHandler):54 -> a
+    22:23:void writeDelayed(com.android.tools.r8.DiagnosticsHandler):73:74 -> a
+    22:23:void close(com.android.tools.r8.DiagnosticsHandler):54 -> a
+    24:29:void close(com.android.tools.r8.DiagnosticsHandler):55:60 -> a
+    30:35:void handleIOException(java.io.IOException,com.android.tools.r8.DiagnosticsHandler):100:105 -> a
+    36:36:void addDirectory(java.lang.String,com.android.tools.r8.DiagnosticsHandler):111:111 -> a
+    37:42:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):133:138 -> a
+    43:43:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):137:137 -> a
+    44:53:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):133:142 -> a
+    54:54:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):141:141 -> a
+    55:55:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):139:139 -> a
+    56:56:void addFile(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):148:148 -> a
+    57:60:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):171:174 -> a
+    61:65:void writeNextIfAvailable(com.android.tools.r8.DiagnosticsHandler):160:164 -> a
+    61:65:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):175 -> a
+    66:67:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):178:179 -> a
+    68:68:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):178:178 -> a
+    69:69:java.nio.file.Path getPath():190:190 -> a
     1:4:java.util.zip.ZipOutputStream getStreamRaw():80:83 -> b
     5:11:java.util.zip.ZipOutputStream getStream(com.android.tools.r8.DiagnosticsHandler):90:96 -> b
-    12:25:void writeDirectoryNow(java.lang.String,com.android.tools.r8.DiagnosticsHandler):115:128 -> b
-    26:28:void writeFileNow(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):153:155 -> b
+    12:14:void writeFileNow(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):153:155 -> b
     1:1:com.android.tools.r8.origin.Origin getOrigin():185:185 -> getOrigin
     1:2:void open():45:46 -> open
 com.android.tools.r8.utils.ArchiveBuilder$1 -> com.android.tools.r8.utils.i:
@@ -61895,7 +62366,7 @@
     19:19:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):105 -> a
     20:20:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):105:105 -> a
     21:23:java.util.Collection collectTypes():112:114 -> a
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1220:1220 -> a
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     24:24:java.util.Collection collectTypes():114 -> a
     25:25:java.util.Collection collectTypes():114:114 -> a
     1:1:java.lang.String toString():121:121 -> toString
@@ -62267,113 +62738,114 @@
     25:25:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):96 -> getProgramResource
     26:26:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):96:96 -> getProgramResource
 com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.utils.O:
-    com.android.tools.r8.StringConsumer usageInformationConsumer -> S0
+    com.android.tools.r8.StringConsumer proguardMapConsumer -> S0
+    boolean hasMarker -> f0
     boolean passthroughDexCode -> i
-    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> W0
     int callGraphCycleEliminatorMaxDepthThreshold -> K
-    boolean quiet -> b0
+    boolean verbose -> b0
     com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> f
-    java.lang.String printCfgFile -> A0
-    boolean enableRedundantConstNumberOptimization -> X
+    boolean enableUninstantiatedTypeOptimization -> X
     boolean enableArgumentRemoval -> q
-    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> t0
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> X0
+    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> t0
     boolean enableClassInlining -> y
+    java.util.List mainDexKeepRules -> J0
     boolean enableTreeShakingOfLibraryMethodOverrides -> G
     boolean printMemory -> h
     java.util.Set neverMergePrefixes -> k
-    boolean minimalMainDex -> J0
-    boolean configurationDebugging -> E0
     int callGraphLikelySpuriousCallEdgeThreshold -> L
     boolean encodeChecksums -> I
     boolean enableNeverMergePrefixes -> j
-    boolean enableStringSwitchConversion -> Q
+    boolean printCfg -> A0
     boolean enableUnusedArgumentRemoval -> r
-    boolean printCfg -> z0
-    boolean lookupLibraryBeforeProgram -> v0
+    boolean enableMinification -> z0
+    java.util.Map warningInvalidDebugInfo -> P0
+    boolean processCovariantReturnTypeAnnotations -> v0
+    boolean enableRedundantConstNumberOptimization -> Y
     boolean enableClassStaticizer -> z
-    boolean enableNestReduction -> r0
+    boolean enableNestBasedAccessDesugaring -> r0
     boolean enableCallSiteOptimizationInfoPropagation -> H
-    boolean enableDesugaring -> n0
-    boolean intermediate -> j0
+    boolean enableLambdaMerging -> n0
     boolean enableHorizontalClassMerging -> o
     int classInliningInstructionLimit -> M
-    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> Z0
-    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> T0
-    boolean invalidDebugInfoFatal -> c0
-    boolean enableValuePropagation -> V
+    com.android.tools.r8.StringConsumer usageInformationConsumer -> T0
+    boolean quiet -> c0
+    boolean enableRedundantFieldLoadElimination -> V
     boolean enableInliningOfInvokesWithNullableReceivers -> w
-    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
+    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> X0
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> Y0
+    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> h0
     boolean enableNameReflectionOptimization -> E
     com.android.tools.r8.ProgramConsumer programConsumer -> d
-    boolean enableInheritanceClassInDexDistributor -> K0
+    boolean minimalMainDex -> K0
     int inliningInstructionLimit -> N
-    boolean skipIR -> F0
+    boolean configurationDebugging -> F0
     boolean enableVerticalClassMerging -> p
-    boolean $assertionsDisabled -> c1
-    boolean ignoreMissingClasses -> B0
-    boolean enableUninstantiatedTypeOptimization -> W
+    boolean enableValuePropagation -> W
     boolean disableInliningOfLibraryMethodOverrides -> x
     com.android.tools.r8.graph.DexItemFactory itemFactory -> a
-    boolean enableMainDexListCheck -> w0
-    java.util.List logArgumentsFilter -> l0
-    java.util.Map warningInvalidDebugInfo -> O0
+    boolean lookupLibraryBeforeProgram -> w0
+    boolean enableNestReduction -> s0
+    java.util.Map warningInvalidParameterAnnotations -> O0
     boolean enableStringConcatenationOptimization -> F
     boolean printTimes -> g
-    boolean enableGeneratedExtensionRegistryShrinking -> o0
-    java.util.List methodsFilter -> h0
-    boolean readCompileTimeAnnotations -> k0
+    boolean enableDesugaring -> o0
+    boolean intermediate -> k0
     com.android.tools.r8.DataResourceConsumer dataResourceConsumer -> e
     boolean enableDynamicTypeOptimization -> m
-    boolean ignoreMainDexMissingClasses -> d0
+    boolean invalidDebugInfoFatal -> d0
     int inliningInstructionAllowance -> O
-    com.android.tools.r8.StringConsumer mainDexListConsumer -> Q0
-    com.android.tools.r8.StringConsumer configurationConsumer -> U0
+    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> U0
     boolean enableNonNullTracking -> u
     com.android.tools.r8.utils.Reporter reporter -> c
-    boolean enableInitializedClassesInInstanceMethodsAnalysis -> T
-    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> H0
-    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> g0
-    boolean skipReadingDexCode -> P0
+    com.android.tools.r8.utils.InternalOptions$AssertionProcessing assertionProcessing -> E0
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> Z0
+    java.util.Set extensiveLoggingFilter -> g0
+    boolean enableInheritanceClassInDexDistributor -> L0
+    boolean debug -> H0
     boolean enableDeterminismAnalysis -> C
-    int inliningControlFlowResolutionBlocksThreshold -> P
+    int inliningMonitorEnterValuesAllowance -> P
+    java.util.function.Consumer syntheticProguardRulesConsumer -> b1
     boolean enableFieldBitAccessAnalysis -> n
-    boolean debug -> G0
-    boolean forceProguardCompatibility -> C0
-    boolean enableRedundantFieldLoadElimination -> U
+    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> M0
+    boolean skipIR -> G0
+    boolean $assertionsDisabled -> d1
+    boolean ignoreMissingClasses -> C0
+    boolean enableInitializedClassesInInstanceMethodsAnalysis -> U
     boolean enableInlining -> v
-    boolean enableTreeShaking -> x0
-    boolean enableGeneratedMessageLiteShrinking -> p0
-    java.util.Map warningInvalidParameterAnnotations -> N0
-    int numberOfThreads -> Y
+    int minApiLevel -> j0
+    boolean enableMainDexListCheck -> x0
+    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> a1
+    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> W0
+    com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> T
+    boolean enableGeneratedExtensionRegistryShrinking -> p0
+    java.util.List logArgumentsFilter -> m0
+    java.util.Map missingEnclosingMembers -> N0
+    boolean readCompileTimeAnnotations -> l0
+    java.util.Set reportedMissingForDesugaring -> c1
+    java.util.List methodsFilter -> i0
     boolean enableServiceLoaderRewriting -> D
-    com.android.tools.r8.StringConsumer proguardMapConsumer -> R0
-    boolean hasMarker -> e0
-    boolean verbose -> a0
-    boolean enableEnumValueOptimization -> R
+    int inliningControlFlowResolutionBlocksThreshold -> Q
+    com.android.tools.r8.StringConsumer mainDexListConsumer -> R0
+    boolean ignoreMainDexMissingClasses -> e0
+    boolean useSmaliSyntax -> a0
+    com.android.tools.r8.StringConsumer configurationConsumer -> V0
+    java.lang.String printCfgFile -> B0
+    boolean enableStringSwitchConversion -> R
     boolean enableUnusedInterfaceRemoval -> s
-    boolean useSmaliSyntax -> Z
-    java.util.Set extensiveLoggingFilter -> f0
-    java.util.List mainDexKeepRules -> I0
+    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> I0
+    int numberOfThreads -> Z
+    boolean skipReadingDexCode -> Q0
     java.util.function.BiPredicate dexClassChecksumFilter -> J
     boolean enableInitializedClassesAnalysis -> A
+    boolean forceProguardCompatibility -> D0
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> b
-    java.util.function.Consumer syntheticProguardRulesConsumer -> a1
     boolean libraryInterfacesMayHaveStaticInitialization -> l
-    int minApiLevel -> i0
-    boolean enableMinification -> y0
-    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> V0
+    boolean enableTreeShaking -> y0
+    boolean enableEnumValueOptimization -> S
+    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> u0
     boolean enableDevirtualization -> t
-    boolean processCovariantReturnTypeAnnotations -> u0
-    boolean enableNestBasedAccessDesugaring -> q0
-    java.util.Map missingEnclosingMembers -> M0
-    boolean enableLambdaMerging -> m0
+    boolean enableGeneratedMessageLiteShrinking -> q0
     boolean enableSideEffectAnalysis -> B
-    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>
@@ -62381,192 +62853,192 @@
     25:25:com.android.tools.r8.utils.DexVersion com.android.tools.r8.utils.AndroidApiLevel.getDexVersion():67:67 -> <clinit>
     25:25:void <clinit>():88 -> <clinit>
     1:1:void <init>():112:112 -> <init>
-    2: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():425:425 -> E
-    1:1:boolean isProtoShrinkingEnabled():1078:1078 -> F
-    1:1:boolean isShrinking():421:421 -> G
-    1:1:boolean isStringSwitchConversionEnabled():1074:1074 -> H
-    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():368 -> J
-    1:1:boolean isDesugaredLibraryCompilation():309:309 -> K
-    1:1:boolean shouldKeepStackMapTable():313 -> K
+    2:522:void <init>():106:626 -> <init>
+    523:527:void <init>():113:117 -> <init>
+    528:528:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):121:121 -> <init>
+    529:1049:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):106:626 -> <init>
+    1050:1057:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):122:129 -> <init>
+    1058:1058:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):133:133 -> <init>
+    1059:1579:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):106:626 -> <init>
+    1580:1591:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):134:145 -> <init>
+    1:1:boolean isDesugaredLibraryCompilation():311:311 -> A
+    1:1:boolean isGeneratingClassFiles():332:332 -> B
+    1:1:boolean isGeneratingDexIndexed():324:324 -> C
+    1:1:boolean isGeneratingDex():320 -> C
+    2:2:boolean isGeneratingDexFilePerClassFile():328:328 -> C
+    2:2:boolean isGeneratingDex():320 -> C
+    1:1:boolean hasConsumer():295:295 -> D
+    1:1:boolean isInterfaceMethodDesugaringEnabled():1067 -> D
+    2:4:boolean isInterfaceMethodDesugaringEnabled():1070:1072 -> D
+    1:1:boolean isMinifying():427:427 -> E
+    1:1:boolean isProtoShrinkingEnabled():1080:1080 -> F
+    1:1:boolean isShrinking():423:423 -> G
+    1:1:boolean isStringSwitchConversionEnabled():1076:1076 -> H
+    1:32:boolean printWarnings():801:832 -> I
+    33:72:boolean printWarnings():828:867 -> I
+    1:4:boolean shouldDesugarNests():367:370 -> J
+    5:5:boolean isGeneratingClassFiles():332:332 -> J
+    5:5:boolean canUseNestBasedAccess():1050 -> J
+    5:5:boolean shouldDesugarNests():370 -> J
+    1:1:boolean isDesugaredLibraryCompilation():311:311 -> K
+    1:1:boolean shouldKeepStackMapTable():315 -> K
     2:2:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():99:99 -> K
-    2:2:boolean shouldKeepStackMapTable():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
+    2:2:boolean shouldKeepStackMapTable():316 -> K
+    3:3:boolean shouldKeepStackMapTable():316:316 -> K
+    1:13:void signalFinishedToConsumers():348:360 -> L
+    1:1:boolean assertionsEnabled():621:621 -> M
+    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():488:496 -> N
+    1:9:java.util.Set getExtensiveLoggingFilter():462:470 -> O
+    1:1:boolean shouldEnableKeepRuleSynthesisForRecompilation():458:458 -> P
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:1:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):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
+    1:1:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):270:270 -> a
+    2:8:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):278:284 -> a
+    2:8:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):273 -> a
+    9:9:boolean isGeneratingClassFiles():332:332 -> a
+    9:9:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):285 -> a
+    9:9:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):273 -> a
+    10:13:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):286:289 -> a
+    10:13:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):273 -> a
+    14:14:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):629:629 -> a
+    15:15:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):651:651 -> a
+    16:17:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):745:746 -> a
     18:18:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    18:18:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):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
+    18:18:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):750 -> a
+    19:19:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):750:750 -> a
     20:20:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    20:20:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):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
+    20:20:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):751 -> a
+    21:21:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):751:751 -> a
+    22:22:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):746:746 -> a
+    23:24:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):758:759 -> a
     25:25:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    25:25:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):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
+    25:25:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):761 -> a
+    26:26:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):761:761 -> a
     27:27:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    27:27:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):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
+    27:27:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):763 -> a
+    28:28:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):763:763 -> a
     29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    29:29:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):762 -> a
+    29:29:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):764 -> a
     30:30:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    30:30:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):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
+    30:30:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):764 -> a
+    31:31:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):764:764 -> a
     32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    32:32:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):765 -> a
+    32:32:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):767 -> a
     33:33:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    33:33:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):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
+    33:33:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):767 -> a
+    34:34:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):767:767 -> a
+    35:35:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):759:759 -> a
+    36:39:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):772:775 -> a
+    40:44:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):780:784 -> a
+    45:51:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):789:795 -> a
+    52:52:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):790:790 -> a
     53:53:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26:26 -> a
-    53:53:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):788 -> a
+    53:53:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):790 -> a
     54:54:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
     54:54:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26 -> a
-    54:54:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):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):638:641 -> b
+    54:54:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):790 -> a
+    55:55:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):790:790 -> a
+    56:56:java.util.List lambda$warningInvalidDebugInfo$3(com.android.tools.r8.origin.Origin):794:794 -> a
+    57:62:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):881:886 -> a
+    63:64:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1021:1022 -> a
+    65:66:boolean canHaveArtInstanceOfVerifierBug():1356:1357 -> a
+    1:4:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):640:643 -> b
     5:5:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> b
-    5:5:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):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
+    5:5:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):645 -> b
+    6:8:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):645:647 -> b
+    9:9:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):643:643 -> b
+    10:10:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):629:629 -> b
+    10:10:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):641 -> b
+    11:15:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):667:671 -> b
+    16:16:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):651:651 -> b
+    16:16:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):672 -> b
+    17:18:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):676:677 -> b
     19:19:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> b
-    19:19:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):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():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):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):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):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():330:330 -> g
-    1:1:boolean canUseConstantMethodHandle():1032 -> g
-    2:2:boolean canUseConstantMethodHandle():1032:1032 -> g
-    1:1:boolean isGeneratingClassFiles():330:330 -> h
-    1:1:boolean canUseConstantMethodType():1036 -> h
-    2:2:boolean canUseConstantMethodType():1036:1036 -> h
-    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():330:330 -> k
-    1:1:boolean canUseInvokeCustom():1040 -> k
-    2:2:boolean canUseInvokeCustom():1040:1040 -> k
-    1:1:boolean isGeneratingClassFiles():330:330 -> l
-    1:1:boolean canUseInvokePolymorphic():1028 -> l
-    2:2:boolean canUseInvokePolymorphic():1028:1028 -> l
-    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():330:330 -> o
-    1:1:boolean canUseNotInstruction():1149 -> o
-    2:2:boolean canUseNotInstruction():1149:1149 -> o
-    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():330:330 -> r
-    1:1:boolean canUseSuppressedExceptions():1087 -> r
-    2:2:boolean canUseSuppressedExceptions():1087:1087 -> r
-    1:1:boolean isGeneratingClassFiles():330:330 -> s
-    1:1:boolean canUseTwrCloseResourceMethod():1056 -> s
-    2:2:boolean canUseTwrCloseResourceMethod():1056:1056 -> s
+    19:19:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):679 -> b
+    20:20:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):679:679 -> b
+    21:21:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):739:739 -> b
+    21:21:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):681 -> b
+    22:22:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):681:681 -> b
+    23:23:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):677:677 -> b
+    24:24:java.util.List lambda$warningInvalidParameterAnnotations$2(com.android.tools.r8.origin.Origin):783:783 -> b
+    25:25:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1433:1433 -> b
+    1:1:boolean isGeneratingClassFiles():332:332 -> c
+    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1447 -> c
+    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1447:1447 -> c
+    3:6:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):633:636 -> c
+    7:7:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):629:629 -> c
+    7:7:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):634 -> c
+    8:10:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):655:657 -> c
+    11:11:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):651:651 -> c
+    11:11:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):658 -> c
+    12:12:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):662:662 -> c
+    13:13:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):739:739 -> c
+    13:13:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):662 -> c
+    14:14:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):662:662 -> c
+    15:15:java.util.List lambda$warningMissingEnclosingMember$1(com.android.tools.r8.origin.Origin):774:774 -> c
+    1:1:boolean isGeneratingClassFiles():332:332 -> d
+    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1103 -> d
+    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1103:1103 -> d
+    3:5:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):685:687 -> d
+    6:40:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):701:735 -> d
+    1:1:boolean isGeneratingClassFiles():332:332 -> e
+    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1054 -> e
+    2:2:boolean canLeaveStaticInterfaceMethodInvokes():1054:1054 -> e
+    3:5:java.lang.String messageWarningMissingNestHost(com.android.tools.r8.graph.DexClass):694:696 -> e
+    1:1:boolean isGeneratingClassFiles():332:332 -> f
+    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1093 -> f
+    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1093:1093 -> f
+    1:1:boolean isGeneratingClassFiles():332:332 -> g
+    1:1:boolean canUseConstantMethodHandle():1034 -> g
+    2:2:boolean canUseConstantMethodHandle():1034:1034 -> g
+    1:1:boolean isGeneratingClassFiles():332:332 -> h
+    1:1:boolean canUseConstantMethodType():1038 -> h
+    2:2:boolean canUseConstantMethodType():1038:1038 -> h
+    1:1:boolean isGeneratingClassFiles():332:332 -> i
+    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1046 -> i
+    2:2:boolean canUseDefaultAndStaticInterfaceMethods():1046:1046 -> i
+    1:2:boolean canUseFilledNewArrayOfObjects():1115:1116 -> j
+    1:1:boolean isGeneratingClassFiles():332:332 -> k
+    1:1:boolean canUseInvokeCustom():1042 -> k
+    2:2:boolean canUseInvokeCustom():1042:1042 -> k
+    1:1:boolean isGeneratingClassFiles():332:332 -> l
+    1:1:boolean canUseInvokePolymorphic():1030 -> l
+    2:2:boolean canUseInvokePolymorphic():1030:1030 -> l
+    1:1:boolean isGeneratingClassFiles():332:332 -> m
+    1:1:boolean canUseInvokePolymorphicOnVarHandle():1026 -> m
+    2:2:boolean canUseInvokePolymorphicOnVarHandle():1026:1026 -> m
+    1:2:boolean canUseMultidex():1084:1085 -> n
+    1:1:boolean isGeneratingClassFiles():332:332 -> o
+    1:1:boolean canUseNotInstruction():1151 -> o
+    2:2:boolean canUseNotInstruction():1151:1151 -> o
+    1:1:boolean isGeneratingClassFiles():332:332 -> p
+    1:1:boolean canUsePrivateInterfaceMethods():1062 -> p
+    2:2:boolean canUsePrivateInterfaceMethods():1062:1062 -> p
+    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1124:1125 -> q
+    1:1:boolean isGeneratingClassFiles():332:332 -> r
+    1:1:boolean canUseSuppressedExceptions():1089 -> r
+    2:2:boolean canUseSuppressedExceptions():1089:1089 -> r
+    1:1:boolean isGeneratingClassFiles():332:332 -> s
+    1:1:boolean canUseTwrCloseResourceMethod():1058 -> s
+    2:2:boolean canUseTwrCloseResourceMethod():1058:1058 -> s
     1:4:void disableAllOptimizations():149:152 -> t
     1:17:void disableGlobalOptimizations():156:172 -> u
-    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():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.utils.InternalOutputMode getInternalOutputMode():299:299 -> v
+    2:2:boolean hasConsumer():295:295 -> v
+    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():299 -> v
+    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():299:299 -> v
+    4:4:boolean isGeneratingDexIndexed():324:324 -> v
+    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():300 -> v
+    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():301:301 -> v
+    6:6:boolean isGeneratingDexFilePerClassFile():328:328 -> v
+    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():302 -> v
+    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():303:303 -> v
+    8:8:boolean isGeneratingClassFiles():332:332 -> v
+    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():304 -> v
+    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():305:307 -> v
     1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():99:99 -> w
-    1:1:boolean hasMethodsFilter():874:874 -> x
+    1:1:boolean hasMethodsFilter():876:876 -> x
     1:1:boolean hasProguardConfiguration():95:95 -> y
-    1:1:boolean hasUsageInformationConsumer():581:581 -> z
+    1:1:boolean hasUsageInformationConsumer():583:583 -> z
 com.android.tools.r8.utils.InternalOptions$AssertionProcessing -> com.android.tools.r8.utils.O$a:
     com.android.tools.r8.utils.InternalOptions$AssertionProcessing LEAVE -> a
     com.android.tools.r8.utils.InternalOptions$AssertionProcessing REMOVE -> b
@@ -62577,7 +63049,7 @@
     int expectedParameterCount -> b
     int actualParameterCount -> c
     com.android.tools.r8.graph.DexMethod method -> a
-    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):538:541 -> <init>
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):540:543 -> <init>
 com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.utils.O$b:
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization ON -> b
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization OFF -> a
@@ -62588,16 +63060,16 @@
     boolean enabled -> a
     int minSize -> b
     int maxSize -> c
-    1:9:void <init>():906:914 -> <init>
+    1:9:void <init>():908:916 -> <init>
 com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.utils.Q:
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] $VALUES -> d
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode FLATTEN -> c
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode REPACKAGE -> b
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode NONE -> a
-    1:5:void <clinit>():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
+    1:5:void <clinit>():901:905 -> <clinit>
+    6:6:void <clinit>():899:899 -> <clinit>
+    1:1:void <init>(java.lang.String,int):899:899 -> <init>
+    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] values():899:899 -> a
 com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.utils.O$d:
     boolean invertConditionals -> m
     boolean dontCreateMarkerInD8 -> o
@@ -62634,20 +63106,20 @@
     boolean addCallEdgesForLibraryInvokes -> c
     java.io.PrintStream whyAreYouNotInliningConsumer -> B
     boolean verifyKeptGraphInfo -> D
-    1:85:void <init>():917:1001 -> <init>
+    1:85:void <init>():919:1003 -> <init>
 com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.utils.S:
     java.util.Comparator interfaceMethodOrdering -> a
-    1:3:void <init>():987:989 -> <init>
-    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):993:994 -> a
-    3:3:int lambda$getInterfaceMethodOrderingOrDefault$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):994:994 -> a
+    1:3:void <init>():989:991 -> <init>
+    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):995:996 -> a
+    3:3:int lambda$getInterfaceMethodOrderingOrDefault$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):996:996 -> a
 com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.utils.T:
     int numberOfProguardIfRuleMemberEvaluations -> b
     int numberOfProguardIfRuleClassEvaluations -> a
-    1:4:void <init>():1004:1007 -> <init>
+    1:4:void <init>():1006:1009 -> <init>
 com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.utils.U:
     com.android.tools.r8.graph.DexType type -> b
     int version -> a
-    1:3:void <init>(int,com.android.tools.r8.graph.DexType):550:552 -> <init>
+    1:3:void <init>(int,com.android.tools.r8.graph.DexType):552:554 -> <init>
 com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.utils.V:
     com.android.tools.r8.utils.InternalOutputMode DexIndexed -> a
     com.android.tools.r8.utils.InternalOutputMode DexFilePerClassFile -> b
@@ -62656,14 +63128,24 @@
     1:1:void <init>(java.lang.String,int):7:7 -> <init>
     1:1:boolean isGeneratingClassFiles():13:13 -> a
     1:1:boolean isGeneratingDex():17:17 -> b
-com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.utils.W:
+com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.utils.X:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():15:15 -> <clinit>
-    1:4:java.lang.Object peekNext(java.util.ListIterator):24:27 -> a
-    5:8:void removeIf(java.util.Iterator,java.util.function.Predicate):34:37 -> a
-    9:21:boolean anyRemainingMatch(java.util.ListIterator,java.util.function.Predicate):57:69 -> a
-    1:3:java.lang.Object peekPrevious(java.util.ListIterator):17:19 -> b
-com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.utils.Y:
+    1:1:void <clinit>():16:16 -> <clinit>
+    1:1:java.util.Iterator filter(java.util.Iterator,java.util.function.Predicate):19:19 -> a
+    2:5:java.lang.Object peekNext(java.util.ListIterator):59:62 -> a
+    6:18:boolean anyRemainingMatch(java.util.ListIterator,java.util.function.Predicate):92:104 -> a
+    1:3:java.lang.Object peekPrevious(java.util.ListIterator):52:54 -> b
+    4:7:void removeIf(java.util.Iterator,java.util.function.Predicate):69:72 -> b
+com.android.tools.r8.utils.IteratorUtils$1 -> com.android.tools.r8.utils.W:
+    java.util.Iterator val$iterator -> b
+    java.util.function.Predicate val$predicate -> c
+    java.lang.Object next -> a
+    1:3:void <init>(java.util.Iterator,java.util.function.Predicate):19:21 -> <init>
+    1:3:java.lang.Object advance():25:27 -> f
+    1:1:boolean hasNext():36:36 -> hasNext
+    1:5:java.lang.Object next():41:45 -> next
+    6:6:java.lang.Object next():43:43 -> next
+com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.utils.Z:
     int columnCapacity -> b
     int rowCapacity -> a
     1:3:void <init>(int,int,float):31:33 -> <init>
@@ -62671,11 +63153,11 @@
     2:2:java.util.Map lambda$put$0(java.lang.Object):46:46 -> a
     3:4:java.lang.Object put(java.lang.Object,java.lang.Object,java.lang.Object):46:47 -> a
     1:1:boolean removeEldestEntry(java.util.Map$Entry):42:42 -> removeEldestEntry
-com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.utils.X:
+com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.utils.Y:
     int columnCapacity -> a
     1:2:void <init>(int,float):17:18 -> <init>
     1:1:boolean removeEldestEntry(java.util.Map$Entry):23:23 -> removeEldestEntry
-com.android.tools.r8.utils.LebUtils -> com.android.tools.r8.utils.Z:
+com.android.tools.r8.utils.LebUtils -> com.android.tools.r8.utils.a0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:6:int parseSleb128(com.android.tools.r8.dex.BinaryReader):65:70 -> a
@@ -62685,7 +63167,7 @@
     7:16:byte[] encodeUleb128(int):32:41 -> b
     17:21:void putUleb128(com.android.tools.r8.dex.DexOutputBuffer,int):48:52 -> b
     1:1:int sizeAsUleb128(int):57:57 -> c
-com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.utils.a0:
+com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.utils.b0:
     1:1:void <init>(com.android.tools.r8.utils.ClassProvider):15:15 -> <init>
     1:1:java.util.function.Supplier getTransparentSupplier(com.android.tools.r8.graph.DexClass):13:13 -> a
     2:2:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):13:13 -> a
@@ -62695,7 +63177,7 @@
     6:6:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):13 -> a
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():34:34 -> c
     1:1:java.lang.String toString():39:39 -> toString
-com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.utils.h0:
+com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.utils.i0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():54:54 -> <clinit>
     1:1:java.util.List com.android.tools.r8.graph.CfCode.getInstructions():131:131 -> a
@@ -62742,7 +63224,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):1097:1097 -> a
+    298:298:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1095:1095 -> 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
@@ -62771,7 +63253,7 @@
     331:333:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):379:381 -> a
     334:334:java.util.List lambda$groupMethodsByRenamedName$5(com.android.tools.r8.graph.DexString):380:380 -> a
     335:340:boolean doesContainPositions(com.android.tools.r8.graph.DexCode):401:406 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.utils.b0:
+com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.utils.c0:
     com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper val$positionRemapper -> i
     com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter val$positionEventEmitter -> h
     boolean $assertionsDisabled -> l
@@ -62790,11 +63272,11 @@
     32:33:void visit(com.android.tools.r8.graph.DexDebugEvent$EndLocal):502:503 -> a
     34:35:void visit(com.android.tools.r8.graph.DexDebugEvent$RestartLocal):508:509 -> a
     1:3:void flushPc():446:448 -> f
-com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.utils.c0:
+com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.utils.d0:
     1:1:void <init>():63:63 -> <init>
     2:2:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):63:63 -> <init>
     1:1:com.android.tools.r8.ir.code.Position createRemappedPosition(int,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):67:67 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.utils.d0:
+com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.utils.e0:
     int obfuscatedLine -> d
     int originalLine -> b
     com.android.tools.r8.ir.code.Position caller -> c
@@ -62805,7 +63287,7 @@
     1:1:int access$200(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):148:148 -> b
     1:1:int access$300(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):148:148 -> c
     1:1:com.android.tools.r8.ir.code.Position access$400(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):148:148 -> d
-com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.utils.e0:
+com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.utils.f0:
     boolean $assertionsDisabled -> e
     int nextOptimizedLineNumber -> d
     com.android.tools.r8.graph.DexMethod previousMethod -> b
@@ -62815,7 +63297,7 @@
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):77:77 -> <init>
     2:10:void <init>(com.android.tools.r8.utils.InternalOptions):73:81 -> <init>
     1:12:com.android.tools.r8.ir.code.Position createRemappedPosition(int,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):87:98 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.utils.f0:
+com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.utils.g0:
     java.util.List processedEvents -> f
     boolean $assertionsDisabled -> g
     int previousPc -> d
@@ -62833,9 +63315,15 @@
     3:15:void access$800(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int,com.android.tools.r8.ir.code.Position):105 -> a
     16:17:int getStartLine():142:143 -> a
     16:17:int access$900(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter):105 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.utils.g0:
+com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.utils.h0:
     com.android.tools.r8.ir.code.Position createRemappedPosition(int,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position) -> a
-com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.utils.i0:
+com.android.tools.r8.utils.ListUtils -> com.android.tools.r8.utils.j0:
+    1:1:void <clinit>():13:13 -> <clinit>
+    1:1:java.lang.Object first(java.util.List):16:16 -> a
+    2:3:int lastIndexMatching(java.util.List,java.util.function.Predicate):25:26 -> a
+    4:6:java.util.List map(java.util.Collection,java.util.function.Function):34:36 -> a
+    1:2:boolean verifyListIsOrdered(java.util.List):42:43 -> b
+com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.utils.k0:
     long max -> b
     long min -> a
     boolean $assertionsDisabled -> c
@@ -62851,7 +63339,7 @@
     1:2:boolean equals(java.lang.Object):66:67 -> equals
     1:1:int hashCode():58:58 -> hashCode
     1:1:java.lang.String toString():74:74 -> toString
-com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.utils.j0:
+com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.utils.l0:
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE -> b
     boolean ignoreName -> a
@@ -62873,7 +63361,7 @@
     11:11:int doHash(java.lang.Object):15 -> a
     1:1:com.android.tools.r8.utils.MethodJavaSignatureEquivalence get():30:30 -> c
     1:1:com.android.tools.r8.utils.MethodJavaSignatureEquivalence getEquivalenceIgnoreName():34:34 -> d
-com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.utils.k0:
+com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.utils.m0:
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE -> b
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     boolean ignoreName -> a
@@ -62887,14 +63375,14 @@
     7:10:int doHash(java.lang.Object):14 -> a
     1:1:com.android.tools.r8.utils.MethodSignatureEquivalence get():28:28 -> c
     1:1:com.android.tools.r8.utils.MethodSignatureEquivalence getEquivalenceIgnoreName():32:32 -> d
-com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.utils.l0:
+com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.utils.n0:
     com.android.tools.r8.utils.OffOrAuto Auto -> b
     com.android.tools.r8.utils.OffOrAuto Off -> a
     com.android.tools.r8.utils.OffOrAuto[] $VALUES -> c
     1:1:void <clinit>():11:11 -> <clinit>
     2:2:void <clinit>():10:10 -> <clinit>
     1:1:void <init>(java.lang.String,int):10:10 -> <init>
-com.android.tools.r8.utils.OneShotByteResource -> com.android.tools.r8.utils.m0:
+com.android.tools.r8.utils.OneShotByteResource -> com.android.tools.r8.utils.o0:
     com.android.tools.r8.origin.Origin origin -> a
     java.util.Set classDescriptors -> d
     boolean $assertionsDisabled -> e
@@ -62907,7 +63395,7 @@
     1:1:java.util.Set getClassDescriptors():54:54 -> getClassDescriptors
     1:1:com.android.tools.r8.ProgramResource$Kind getKind():41:41 -> getKind
     1:1:com.android.tools.r8.origin.Origin getOrigin():36:36 -> getOrigin
-com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.utils.n0:
+com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.utils.p0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:13:java.lang.String tryParseSingle(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String,java.lang.String):37:49 -> a
@@ -62915,14 +63403,14 @@
     19:19:java.lang.String tryParseSingle(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String,java.lang.String):41:41 -> a
     20:27:java.lang.Boolean tryParseBoolean(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String):60:67 -> a
     1:11:java.util.List tryParseMulti(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String):18:28 -> b
-com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.utils.n0$a:
+com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.utils.p0$a:
     java.lang.String[] args -> a
     int nextIndex -> b
     1:1:void <init>(java.lang.String[]):76:76 -> <init>
     2:5:void <init>(java.lang.String[]):74:77 -> <init>
     1:1:java.lang.String head():81:81 -> a
     1:5:java.lang.String next():85:89 -> b
-com.android.tools.r8.utils.OrderedMergingIterator -> com.android.tools.r8.utils.o0:
+com.android.tools.r8.utils.OrderedMergingIterator -> com.android.tools.r8.utils.q0:
     java.util.List other -> b
     java.util.List one -> a
     int otherIndex -> d
@@ -62945,14 +63433,14 @@
     17:17:com.android.tools.r8.graph.KeyedDexItem next():44 -> next
     18:25:com.android.tools.r8.graph.KeyedDexItem next():46:53 -> next
     26:26:com.android.tools.r8.graph.KeyedDexItem next():51:51 -> next
-com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.utils.p0:
+com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.utils.r0:
     void addDirectory(java.lang.String,com.android.tools.r8.DiagnosticsHandler) -> a
     void addFile(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler) -> a
     void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler) -> a
     void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler) -> a
     void close(com.android.tools.r8.DiagnosticsHandler) -> a
     java.nio.file.Path getPath() -> a
-com.android.tools.r8.utils.Pair -> com.android.tools.r8.utils.q0:
+com.android.tools.r8.utils.Pair -> com.android.tools.r8.utils.s0:
     java.lang.Object second -> b
     java.lang.Object first -> a
     1:3:void <init>(java.lang.Object,java.lang.Object):23:25 -> <init>
@@ -62962,35 +63450,35 @@
     2:2:void setSecond(java.lang.Object):41:41 -> b
     1:1:boolean equals(java.lang.Object):51:51 -> equals
     1:1:int hashCode():46:46 -> hashCode
-com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.utils.r0:
+com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.utils.t0:
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver conflictResolver -> d
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():23:23 -> <clinit>
-    1:2:void <init>(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):41:42 -> <init>
-    1:1:java.util.function.Supplier getTransparentSupplier(com.android.tools.r8.graph.DexClass):23:23 -> a
-    2:2:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):23:23 -> a
-    3:3:com.android.tools.r8.graph.DexProgramClass resolveClassConflict(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):52:52 -> a
-    3:3:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):23 -> a
-    4:9:com.android.tools.r8.utils.ProgramClassCollection create(java.util.List,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):30:35 -> a
-    10:10:java.util.function.Supplier lambda$create$0(com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver,java.util.function.Supplier,java.util.function.Supplier):33:33 -> a
-    11:11:com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver disallowClassConflictsResolver(com.android.tools.r8.utils.Reporter):66:66 -> a
-    12:17: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):67:72 -> a
-    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():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
-    26:26:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):79 -> a
+    1:1:void <clinit>():24:24 -> <clinit>
+    1:2:void <init>(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):42:43 -> <init>
+    1:1:java.util.function.Supplier getTransparentSupplier(com.android.tools.r8.graph.DexClass):24:24 -> a
+    2:2:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):24:24 -> a
+    3:3:com.android.tools.r8.graph.DexProgramClass resolveClassConflict(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):53:53 -> a
+    3:3:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):24 -> a
+    4:9:com.android.tools.r8.utils.ProgramClassCollection create(java.util.List,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):31:36 -> a
+    10:10:java.util.function.Supplier lambda$create$0(com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver,java.util.function.Supplier,java.util.function.Supplier):34:34 -> a
+    11:11:com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver disallowClassConflictsResolver(com.android.tools.r8.utils.Reporter):67:67 -> a
+    12:17: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):68:73 -> a
+    18:23:boolean assumeClassesAreEqual(com.android.tools.r8.graph.DexProgramClass):85:90 -> a
+    18: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):74 -> 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):77:77 -> a
+    25:25:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> 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):79 -> a
+    26:26:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):79:79 -> a
     27:27:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    27:27:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):79 -> a
-    28:28:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):79:79 -> a
-    29:31:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    29:31:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):76 -> a
-    1:1:com.android.tools.r8.graph.ClassKind getClassKind():62:62 -> c
-    1:1:java.lang.String toString():47:47 -> toString
-com.android.tools.r8.utils.Reporter -> com.android.tools.r8.utils.t0:
+    27:27:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):80 -> a
+    28:28:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
+    28:28:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):80 -> a
+    29:29:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):80:80 -> a
+    30:32:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
+    30:32:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77 -> a
+    1:1:com.android.tools.r8.graph.ClassKind getClassKind():63:63 -> c
+    1:1:java.lang.String toString():48:48 -> toString
+com.android.tools.r8.utils.Reporter -> com.android.tools.r8.utils.v0:
     com.android.tools.r8.DiagnosticsHandler clientHandler -> a
     com.android.tools.r8.Diagnostic lastError -> c
     java.util.Collection suppressedExceptions -> d
@@ -63002,15 +63490,18 @@
     2:5:void error(com.android.tools.r8.Diagnostic,java.lang.Throwable):53:56 -> a
     6:24:void failIfPendingErrors():89:107 -> a
     25:25:java.lang.Throwable addSuppressedExceptions(java.lang.Throwable):111:111 -> a
-    1:1:java.lang.RuntimeException fatalError(java.lang.String):63:63 -> b
-    2:4:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic):71:73 -> b
-    2:4:java.lang.RuntimeException fatalError(java.lang.String):63 -> b
+    1:4:void error(com.android.tools.r8.Diagnostic,java.lang.Throwable):53:56 -> b
+    1:4:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic,java.lang.Throwable):80 -> b
+    5:6:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic,java.lang.Throwable):81:82 -> b
+    7:7:java.lang.RuntimeException fatalError(java.lang.String):63:63 -> b
+    8:10:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic):71:73 -> b
+    8:10:java.lang.RuntimeException fatalError(java.lang.String):63 -> b
     1:3:void error(com.android.tools.r8.Diagnostic):43:45 -> error
     1:1:void info(com.android.tools.r8.Diagnostic):33:33 -> info
     1:1:void warning(com.android.tools.r8.Diagnostic):38:38 -> warning
-com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.utils.s0:
+com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.utils.u0:
     1:1:void <init>():24:24 -> <init>
-com.android.tools.r8.utils.SingletonEquivalence -> com.android.tools.r8.utils.u0:
+com.android.tools.r8.utils.SingletonEquivalence -> com.android.tools.r8.utils.w0:
     1:1:void <init>():11:11 -> <init>
     boolean doEquivalent(java.lang.Object,java.lang.Object) -> a
     int doHash(java.lang.Object) -> a
@@ -63024,7 +63515,7 @@
     1:1:java.lang.String getDiagnosticMessage():53:53 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():43:43 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():48:48 -> getPosition
-com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.utils.v0:
+com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.utils.x0:
     char[] EMPTY_CHAR_ARRAY -> a
     java.lang.String LINE_SEPARATOR -> c
     java.lang.String[] EMPTY_ARRAY -> b
@@ -63057,7 +63548,7 @@
     1:2:java.lang.String stripLeadingBOM(java.lang.String):279:280 -> c
     1:9:java.lang.String toASCIIString(java.lang.String):49:57 -> d
     1:9:java.lang.String trim(java.lang.String):288:296 -> e
-com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.utils.v0$a:
+com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.utils.x0$a:
     com.android.tools.r8.utils.StringUtils$BraceType SQUARE -> b
     com.android.tools.r8.utils.StringUtils$BraceType TUBORG -> c
     com.android.tools.r8.utils.StringUtils$BraceType PARENS -> a
@@ -63066,7 +63557,7 @@
     1:4:void <clinit>():22:25 -> <clinit>
     5:5:void <clinit>():21:21 -> <clinit>
     1:1:void <init>(java.lang.String,int):21:21 -> <init>
-com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.utils.x0:
+com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.utils.z0:
     char[] IDENTIFIER_CHARACTERS -> b
     boolean $assertionsDisabled -> e
     java.util.Set PRIMITIVE_TYPE_NAMES -> a
@@ -63075,31 +63566,31 @@
     1:15:void <clinit>():13:27 -> <clinit>
     1:1:java.lang.String numberToIdentifier(int,com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing):31:31 -> a
     2:35:java.lang.String numberToIdentifier(int,com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing,char[],boolean):43:76 -> a
-com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.utils.w0:
+com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.utils.y0:
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing DONT_USE_MIXED_CASE -> b
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing USE_MIXED_CASE -> a
     1:2:void <clinit>():16:17 -> <clinit>
     1:1:void <init>(java.lang.String,int):15:15 -> <init>
-com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.utils.y0:
-com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.utils.z0:
+com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.utils.A0:
+com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.utils.B0:
     char nextChar() -> a
-com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.utils.A0:
-com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.utils.B0:
+com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.utils.C0:
+com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.utils.D0:
     1:1:void <init>():9:9 -> <init>
     boolean hasNext() -> a
     1:4:int nextIntComputeIfAbsent(com.android.tools.r8.utils.ThrowingIntSupplier):22:25 -> a
     int nextInt() -> b
-com.android.tools.r8.utils.ThrowingIntSupplier -> com.android.tools.r8.utils.C0:
+com.android.tools.r8.utils.ThrowingIntSupplier -> com.android.tools.r8.utils.E0:
     int getAsInt() -> a
-com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.utils.D0:
+com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.utils.F0:
     1:1:void <init>():11:11 -> <init>
     boolean hasNext() -> a
     1:4:java.lang.Object computeNextIfAbsent(com.android.tools.r8.utils.ThrowingSupplier):18:21 -> a
     5:10:java.util.List take(int):25:30 -> a
     11:11:java.util.List take(int):28:28 -> a
     java.lang.Object next() -> b
-com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.utils.E0:
-com.android.tools.r8.utils.Timing -> com.android.tools.r8.utils.H0:
+com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.utils.G0:
+com.android.tools.r8.utils.Timing -> com.android.tools.r8.utils.J0:
     java.util.Stack stack -> a
     boolean trackMemory -> b
     1:1:void <init>(java.lang.String):31:31 -> <init>
@@ -63132,10 +63623,10 @@
     12:12:java.util.Map access$100(com.android.tools.r8.utils.Timing):21 -> b
     13:13:java.util.Map computeMemoryInformation():211:211 -> b
     13:13:java.util.Map access$100(com.android.tools.r8.utils.Timing):21 -> b
-com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.utils.F0:
+com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.utils.H0:
     long used -> a
     1:2:void <init>(long):43:44 -> <init>
-com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.utils.G0:
+com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.utils.I0:
     com.android.tools.r8.utils.Timing this$0 -> g
     java.util.Map children -> b
     java.lang.String title -> a
@@ -63182,9 +63673,9 @@
     3:3:java.lang.String com.android.tools.r8.utils.Timing.access$200(long):21 -> toString
     3:3:java.lang.String toString():96 -> toString
     4:4:java.lang.String toString():96:96 -> toString
-com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.utils.I0:
+com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.utils.K0:
     java.lang.Object apply(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.utils.J0:
+com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.utils.L0:
     com.android.tools.r8.utils.VersionProperties INSTANCE -> c
     java.lang.String sha -> a
     java.lang.String releaser -> b
diff --git a/r8-master.jar b/r8-master.jar
index 0e8f35b..e583b08 100644
--- a/r8-master.jar
+++ b/r8-master.jar
Binary files differ
diff --git a/r8-master.jar.map b/r8-master.jar.map
index 5656edd..f06612e 100644
--- a/r8-master.jar.map
+++ b/r8-master.jar.map
@@ -1,7 +1,7 @@
 # compiler: R8
-# compiler_version: 1.7.7-dev
+# compiler_version: 1.7.12-dev
 # compiler_hash: engineering
-# pg_map_id: 41bac76
+# pg_map_id: bcf14ea
 # common_typos_disable
 com.android.tools.r8.ApiLevelException -> com.android.tools.r8.a:
     boolean $assertionsDisabled -> c
@@ -167,19 +167,19 @@
     com.android.tools.r8.StringConsumer mainDexListConsumer -> g
     com.android.tools.r8.ProgramConsumer programConsumer -> f
     com.android.tools.r8.CompilationMode mode -> e
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:10:void <init>(boolean,boolean):44:53 -> <init>
-    11:22:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean,java.util.function.BiPredicate):67:78 -> <init>
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:10:void <init>(boolean,boolean):43:52 -> <init>
+    11:22:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean,java.util.function.BiPredicate):66:77 -> <init>
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:1:com.android.tools.r8.utils.Reporter getReporter():134:134 -> a
-    1:1:java.util.function.BiPredicate getDexClassChecksumFilter():122:122 -> getDexClassChecksumFilter
-    1:1:boolean getEnableDesugaring():112:112 -> getEnableDesugaring
-    1:1:boolean getIncludeClassesChecksum():117:117 -> getIncludeClassesChecksum
-    1:1:com.android.tools.r8.StringConsumer getMainDexListConsumer():107:107 -> getMainDexListConsumer
-    1:1:int getMinApiLevel():91:91 -> getMinApiLevel
-    1:1:com.android.tools.r8.CompilationMode getMode():86:86 -> getMode
-    1:1:com.android.tools.r8.ProgramConsumer getProgramConsumer():100:100 -> getProgramConsumer
-    1:1:boolean isOptimizeMultidexForLinearAlloc():130:130 -> isOptimizeMultidexForLinearAlloc
+    1:1:com.android.tools.r8.utils.Reporter getReporter():133:133 -> a
+    1:1:java.util.function.BiPredicate getDexClassChecksumFilter():121:121 -> getDexClassChecksumFilter
+    1:1:boolean getEnableDesugaring():111:111 -> getEnableDesugaring
+    1:1:boolean getIncludeClassesChecksum():116:116 -> getIncludeClassesChecksum
+    1:1:com.android.tools.r8.StringConsumer getMainDexListConsumer():106:106 -> getMainDexListConsumer
+    1:1:int getMinApiLevel():90:90 -> getMinApiLevel
+    1:1:com.android.tools.r8.CompilationMode getMode():85:85 -> getMode
+    1:1:com.android.tools.r8.ProgramConsumer getProgramConsumer():99:99 -> getProgramConsumer
+    1:1:boolean isOptimizeMultidexForLinearAlloc():129:129 -> isOptimizeMultidexForLinearAlloc
 com.android.tools.r8.BaseCompilerCommand$Builder -> com.android.tools.r8.BaseCompilerCommand$Builder:
     boolean includeClassesChecksum -> n
     java.util.function.BiPredicate dexClassChecksumFilter -> p
@@ -193,57 +193,57 @@
     com.android.tools.r8.OutputMode outputMode -> i
     boolean $assertionsDisabled -> q
     java.util.List desugaredLibraryConfigurationResources -> m
-    1:1:void <clinit>():144:144 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler):170:170 -> <init>
-    2:25:void <init>(com.android.tools.r8.DiagnosticsHandler):148:171 -> <init>
-    26:26:void <init>(com.android.tools.r8.utils.AndroidApp):176:176 -> <init>
-    27:56:void <init>(com.android.tools.r8.utils.AndroidApp):148:177 -> <init>
-    57:57:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):182:182 -> <init>
-    58:93:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):148:183 -> <init>
+    1:1:void <clinit>():143:143 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler):169:169 -> <init>
+    2:25:void <init>(com.android.tools.r8.DiagnosticsHandler):147:170 -> <init>
+    26:26:void <init>(com.android.tools.r8.utils.AndroidApp):175:175 -> <init>
+    27:56:void <init>(com.android.tools.r8.utils.AndroidApp):147:176 -> <init>
+    57:57:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):181:181 -> <init>
+    58:93:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):147:182 -> <init>
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:33:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):349:381 -> a
-    34:45:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):451:462 -> a
-    46:46:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):455:455 -> a
+    1:33:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):348:380 -> a
+    34:45:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):450:461 -> a
+    46:46:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):454:454 -> a
     47:47:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    47:47:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):455 -> a
+    47:47:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):454 -> a
     48:48:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     48:48:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    48:48:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):455 -> a
-    49:49:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):455:455 -> a
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):438:439 -> addDesugaredLibraryConfiguration
-    3:5:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):438:440 -> addDesugaredLibraryConfiguration
-    6:7:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(com.android.tools.r8.StringResource):445:446 -> addDesugaredLibraryConfiguration
-    1:1:com.android.tools.r8.BaseCompilerCommand$Builder addSpecialLibraryConfiguration(java.lang.String):432:432 -> addSpecialLibraryConfiguration
-    1:32:void validate():482:513 -> d
+    48:48:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):454 -> a
+    49:49:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration getDesugaredLibraryConfiguration(com.android.tools.r8.graph.DexItemFactory,boolean):454:454 -> a
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):437:438 -> addDesugaredLibraryConfiguration
+    3:5:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(java.lang.String):437:439 -> addDesugaredLibraryConfiguration
+    6:7:com.android.tools.r8.BaseCompilerCommand$Builder addDesugaredLibraryConfiguration(com.android.tools.r8.StringResource):444:445 -> addDesugaredLibraryConfiguration
+    1:1:com.android.tools.r8.BaseCompilerCommand$Builder addSpecialLibraryConfiguration(java.lang.String):431:431 -> addSpecialLibraryConfiguration
+    1:29:void validate():481:509 -> d
     com.android.tools.r8.CompilationMode defaultCompilationMode() -> e
-    1:1:boolean hasDesugaredLibraryConfiguration():466:466 -> f
-    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: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 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
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setIncludeClassesChecksum(boolean):471:472 -> setIncludeClassesChecksum
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setMainDexListConsumer(com.android.tools.r8.StringConsumer):305:306 -> setMainDexListConsumer
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setMainDexListOutputPath(java.nio.file.Path):292:293 -> setMainDexListOutputPath
-    1:5:com.android.tools.r8.BaseCompilerCommand$Builder setMinApiLevel(int):396:400 -> setMinApiLevel
-    1:3:com.android.tools.r8.BaseCompilerCommand$Builder setMode(com.android.tools.r8.CompilationMode):197:199 -> setMode
-    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setOptimizeMultidexForLinearAlloc(boolean):253:254 -> setOptimizeMultidexForLinearAlloc
-    1:1:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):320:320 -> setOutput
-    2:7:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):325:330 -> setOutput
-    1:4:com.android.tools.r8.BaseCompilerCommand$Builder setProgramConsumer(com.android.tools.r8.ProgramConsumer):276:279 -> setProgramConsumer
+    1:1:boolean hasDesugaredLibraryConfiguration():465:465 -> f
+    1:1:boolean isOptimizeMultidexForLinearAlloc():261:261 -> g
+    1:1:java.util.function.BiPredicate getDexClassChecksumFilter():243:243 -> getDexClassChecksumFilter
+    1:1:boolean getDisableDesugaring():426:426 -> getDisableDesugaring
+    1:1:boolean getIncludeClassesChecksum():476:476 -> getIncludeClassesChecksum
+    1:1:com.android.tools.r8.StringConsumer getMainDexListConsumer():236:236 -> getMainDexListConsumer
+    1:1:int getMinApiLevel():385:385 -> getMinApiLevel
+    1:1:com.android.tools.r8.CompilationMode getMode():189:189 -> getMode
+    1:1:com.android.tools.r8.OutputMode getOutputMode():218:218 -> getOutputMode
+    1:1:java.nio.file.Path getOutputPath():208:208 -> getOutputPath
+    1:1:com.android.tools.r8.ProgramConsumer getProgramConsumer():229:229 -> getProgramConsumer
+    1:1:boolean isMinApiLevelSet():389:389 -> isMinApiLevelSet
+    1:3:com.android.tools.r8.BaseCompilerCommand$Builder setDexClassChecksumFilter(java.util.function.BiPredicate):339:341 -> setDexClassChecksumFilter
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setDisableDesugaring(boolean):420:421 -> setDisableDesugaring
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setEnableDesugaring(boolean):404:405 -> setEnableDesugaring
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setIncludeClassesChecksum(boolean):470:471 -> setIncludeClassesChecksum
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setMainDexListConsumer(com.android.tools.r8.StringConsumer):304:305 -> setMainDexListConsumer
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setMainDexListOutputPath(java.nio.file.Path):291:292 -> setMainDexListOutputPath
+    1:5:com.android.tools.r8.BaseCompilerCommand$Builder setMinApiLevel(int):395:399 -> setMinApiLevel
+    1:3:com.android.tools.r8.BaseCompilerCommand$Builder setMode(com.android.tools.r8.CompilationMode):196:198 -> setMode
+    1:2:com.android.tools.r8.BaseCompilerCommand$Builder setOptimizeMultidexForLinearAlloc(boolean):252:253 -> setOptimizeMultidexForLinearAlloc
+    1:1:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):319:319 -> setOutput
+    2:7:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):324:329 -> setOutput
+    1:4:com.android.tools.r8.BaseCompilerCommand$Builder setProgramConsumer(com.android.tools.r8.ProgramConsumer):275:278 -> setProgramConsumer
 com.android.tools.r8.BaseCompilerCommand$Builder$1 -> com.android.tools.r8.BaseCompilerCommand$Builder$a:
-    1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):356:356 -> <init>
+    1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):355:355 -> <init>
 com.android.tools.r8.BaseCompilerCommand$Builder$2 -> com.android.tools.r8.BaseCompilerCommand$Builder$b:
-    1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):363:363 -> <init>
+    1:1:void <init>(com.android.tools.r8.BaseCompilerCommand$Builder,java.nio.file.Path,boolean):362:362 -> <init>
 com.android.tools.r8.BaseCompilerCommandParser -> com.android.tools.r8.b:
     1:1:void <init>():9:9 -> <init>
     1:10:void parseMinApi(com.android.tools.r8.BaseCompilerCommand$Builder,java.lang.String,com.android.tools.r8.origin.Origin):14:23 -> a
@@ -334,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):363:363 -> a
+    21:21:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):358:358 -> a
     21:21:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):246 -> a
     22:26:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):247:251 -> a
     1:1:void lambda$run$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):102:102 -> b
     1:3:void lambda$runForTesting$3(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):141:143 -> c
     1:27:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):150:176 -> d
-    28:28:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):359:359 -> d
+    28:28:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):354:354 -> d
     28:28:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):176 -> d
     29:39:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):177:187 -> d
     40:44:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):183:187 -> d
@@ -640,13 +640,15 @@
     1:7:void deleteClassesDexFiles(java.nio.file.Path):280:286 -> a
     8:14:void deleteClassesDexFiles(java.nio.file.Path):280:286 -> a
     15:15:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):286:286 -> a
-    1:7:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):246:252 -> accept
-    8:8:java.lang.String com.android.tools.r8.DexIndexedConsumer$ForwardingConsumer.getDexFileName(int):97:97 -> accept
-    8:8:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):252 -> accept
-    9:9:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):252:252 -> accept
-    10:10:void accept(com.android.tools.r8.DataDirectoryResource,com.android.tools.r8.DiagnosticsHandler):257:257 -> accept
-    11:11:void accept(com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):262:262 -> accept
-    1:5:void prepareDirectory():272:276 -> b
+    1:1:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):246:246 -> accept
+    2:6:void prepareDirectory():272:276 -> accept
+    2:6:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):248 -> accept
+    7:9:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):250:252 -> accept
+    10:10:java.lang.String com.android.tools.r8.DexIndexedConsumer$ForwardingConsumer.getDexFileName(int):97:97 -> accept
+    10:10:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):252 -> accept
+    11:11:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):252:252 -> accept
+    12:12:void accept(com.android.tools.r8.DataDirectoryResource,com.android.tools.r8.DiagnosticsHandler):257:257 -> accept
+    13:13:void accept(com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):262:262 -> accept
     1:2:void finished(com.android.tools.r8.DiagnosticsHandler):267:268 -> finished
     1:1:com.android.tools.r8.DataResourceConsumer getDataResourceConsumer():240:240 -> getDataResourceConsumer
     1:1:java.nio.file.Path internalGetOutputPath():312:312 -> internalGetOutputPath
@@ -954,16 +956,17 @@
 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) -> a
-    java.lang.StringBuilder outline11(java.lang.String,int,java.lang.String) -> a
+    java.lang.String outline10(java.lang.StringBuilder,java.lang.String,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.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
+    java.lang.String outline3(com.android.tools.r8.graph.DexMethod,java.lang.StringBuilder,java.lang.String) -> a
+    java.lang.String outline4(com.android.tools.r8.graph.DexType,java.lang.StringBuilder,java.lang.String) -> a
+    java.lang.String outline5(java.lang.String,int) -> a
+    java.lang.String outline6(java.lang.String,int,int) -> a
+    java.lang.String outline8(java.lang.String,java.lang.String) -> a
+    java.lang.String outline9(java.lang.StringBuilder,int,java.lang.String) -> a
+    java.lang.String outline7(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>
@@ -974,7 +977,7 @@
     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():342:342 -> a
+    43:43:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():344:344 -> a
     43:43:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):139 -> a
     43:43:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
     44:52:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):139:147 -> a
@@ -1164,34 +1167,34 @@
     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
+    1221:1226: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:858 -> a
+    1227: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):856:861 -> a
+    1233:1233:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22: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):861 -> a
+    1234:1234:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1234:1234:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> 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):861 -> 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):861:861 -> a
+    1236:1239:void computeKotlinInfoForProgramClasses(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):865:868 -> a
+    1240:1240:void lambda$run$12(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):887:887 -> a
+    1241:1241:void lambda$main$13(java.lang.String[]):903:903 -> 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[]):872:873 -> b
+    4:5:void run(java.lang.String[]):873:874 -> b
     6:6:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> b
-    6:6:void run(java.lang.String[]):874 -> b
-    7:7:void run(java.lang.String[]):875:875 -> b
+    6:6:void run(java.lang.String[]):875 -> b
+    7:7:void run(java.lang.String[]):876:876 -> 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[]):874 -> b
-    9:16:void run(java.lang.String[]):878:885 -> b
+    8:8:void run(java.lang.String[]):875 -> b
+    9:16:void run(java.lang.String[]):879:886 -> 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
+    17:17:void run(java.lang.String[]):886 -> b
+    18:18:void run(java.lang.String[]):889:889 -> 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[]):898:902 -> main
+    1:5:void main(java.lang.String[]):899:903 -> 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):55:55 -> run
@@ -1200,10 +1203,10 @@
     3:3:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):55:55 -> runForTesting
     3:3:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):226 -> runForTesting
     1:2:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):193:194 -> writeApplication
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> writeApplication
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> writeApplication
     3:3:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):195 -> writeApplication
     4:4:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):196:196 -> writeApplication
-    5:5:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():342:342 -> writeApplication
+    5:5:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():344:344 -> writeApplication
     5:5:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):198 -> writeApplication
     6:20:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):198:212 -> writeApplication
 com.android.tools.r8.R8Command -> com.android.tools.r8.R8Command:
@@ -1225,30 +1228,30 @@
     com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration libraryConfiguration -> C
     java.lang.String USAGE_MESSAGE -> E
     com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> B
-    1:558:void <clinit>():56:613 -> <clinit>
+    1:559:void <clinit>():56:614 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ProgramConsumer,java.util.List,com.android.tools.r8.StringConsumer,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.CompilationMode,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean,boolean,boolean,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,java.util.function.Consumer,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.R8Command$1):57:57 -> <init>
     2:2:void <init>(boolean,boolean,com.android.tools.r8.R8Command$1):57:57 -> <init>
-    3:31:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ProgramConsumer,java.util.List,com.android.tools.r8.StringConsumer,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.CompilationMode,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean,boolean,boolean,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,java.util.function.Consumer,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,com.android.tools.r8.features.FeatureSplitConfiguration):706:734 -> <init>
-    32:48:void <init>(boolean,boolean):738:754 -> <init>
-    1:3:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):881:883 -> a
-    1:1:com.android.tools.r8.R8Command$Builder builder():634:634 -> builder
-    2:2:void com.android.tools.r8.R8Command$Builder.<init>():108:108 -> builder
-    2:2:com.android.tools.r8.R8Command$Builder builder():634 -> builder
-    3:3:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):639:639 -> builder
-    4:4:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):644:644 -> builder
-    5:5:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):649:649 -> builder
-    1:1:boolean getEnableMinification():764:764 -> getEnableMinification
-    1:1:boolean getEnableTreeShaking():759:759 -> getEnableTreeShaking
-    1:53:com.android.tools.r8.utils.InternalOptions getInternalOptions():769:821 -> getInternalOptions
-    54:64:com.android.tools.r8.utils.InternalOptions getInternalOptions():818:828 -> getInternalOptions
-    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():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
-    2:2:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):676:676 -> parse
+    3:31:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ProgramConsumer,java.util.List,com.android.tools.r8.StringConsumer,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.CompilationMode,int,com.android.tools.r8.utils.Reporter,boolean,boolean,boolean,boolean,boolean,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,java.util.function.Consumer,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration,com.android.tools.r8.features.FeatureSplitConfiguration):707:735 -> <init>
+    32:48:void <init>(boolean,boolean):739:755 -> <init>
+    1:3:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):882:884 -> a
+    1:1:com.android.tools.r8.R8Command$Builder builder():635:635 -> builder
+    2:2:void com.android.tools.r8.R8Command$Builder.<init>():109:109 -> builder
+    2:2:com.android.tools.r8.R8Command$Builder builder():635 -> builder
+    3:3:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):640:640 -> builder
+    4:4:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):645:645 -> builder
+    5:5:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):650:650 -> builder
+    1:1:boolean getEnableMinification():765:765 -> getEnableMinification
+    1:1:boolean getEnableTreeShaking():760:760 -> getEnableTreeShaking
+    1:53:com.android.tools.r8.utils.InternalOptions getInternalOptions():770:822 -> getInternalOptions
+    54:64:com.android.tools.r8.utils.InternalOptions getInternalOptions():819:829 -> getInternalOptions
+    65:75:com.android.tools.r8.utils.InternalOptions getInternalOptions():826:836 -> getInternalOptions
+    76:86:com.android.tools.r8.utils.InternalOptions getInternalOptions():833:843 -> getInternalOptions
+    87:104:com.android.tools.r8.utils.InternalOptions getInternalOptions():840:857 -> getInternalOptions
+    105:105:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> getInternalOptions
+    105:105:com.android.tools.r8.utils.InternalOptions getInternalOptions():858 -> getInternalOptions
+    106:120:com.android.tools.r8.utils.InternalOptions getInternalOptions():859:873 -> getInternalOptions
+    1:1:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):663:663 -> parse
+    2:2:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):677:677 -> parse
 com.android.tools.r8.R8Command$1 -> com.android.tools.r8.R8Command$a:
 com.android.tools.r8.R8Command$Builder -> com.android.tools.r8.R8Command$Builder:
     java.util.List mainDexRules -> r
@@ -1272,72 +1275,72 @@
     1:1:void <clinit>():64:64 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.R8Command$1):65:65 -> <init>
     2:2:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.R8Command$1):65:65 -> <init>
-    3:3:void <init>():108:108 -> <init>
-    4:4:void <init>(com.android.tools.r8.DiagnosticsHandler):112:112 -> <init>
-    5:24:void <init>(com.android.tools.r8.DiagnosticsHandler):85:104 -> <init>
-    25:25:void <init>(com.android.tools.r8.utils.AndroidApp):116:116 -> <init>
-    26:45:void <init>(com.android.tools.r8.utils.AndroidApp):85:104 -> <init>
-    46:46:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):120:120 -> <init>
-    47:66:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):85:104 -> <init>
+    3:3:void <init>():109:109 -> <init>
+    4:4:void <init>(com.android.tools.r8.DiagnosticsHandler):113:113 -> <init>
+    5:25:void <init>(com.android.tools.r8.DiagnosticsHandler):85:105 -> <init>
+    26:26:void <init>(com.android.tools.r8.utils.AndroidApp):117:117 -> <init>
+    27:47:void <init>(com.android.tools.r8.utils.AndroidApp):85:105 -> <init>
+    48:48:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):121:121 -> <init>
+    49:69:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):85:105 -> <init>
     1:1:java.lang.Boolean lambda$new$0(java.lang.String,java.lang.Long):100:100 -> a
-    2:3:void lambda$addMainDexRulesFiles$1(java.nio.file.Path[]):168:169 -> a
-    4:5:void lambda$addMainDexRulesFiles$2(java.util.Collection):178:179 -> a
-    6:7:void lambda$addMainDexRules$3(java.util.List,com.android.tools.r8.origin.Origin):187:188 -> a
-    8:8:void lambda$addMainDexRules$3(java.util.List,com.android.tools.r8.origin.Origin):187:187 -> a
-    9:10:void lambda$addProguardConfigurationFiles$5(java.util.List):205:206 -> a
-    11:11:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):376:376 -> a
-    12:14:void lambda$makeR8Command$7(com.android.tools.r8.DataResourceProvider$Visitor,com.android.tools.r8.utils.Reporter,com.android.tools.r8.DataResourceProvider):495:497 -> a
-    15:17:void lambda$addProguardConfigurationConsumerForTesting$8(java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):560:562 -> a
-    1:1:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):365:365 -> addFeatureSplit
+    2:3:void lambda$addMainDexRulesFiles$1(java.nio.file.Path[]):169:170 -> a
+    4:5:void lambda$addMainDexRulesFiles$2(java.util.Collection):179:180 -> a
+    6:7:void lambda$addMainDexRules$3(java.util.List,com.android.tools.r8.origin.Origin):188:189 -> a
+    8:8:void lambda$addMainDexRules$3(java.util.List,com.android.tools.r8.origin.Origin):188:188 -> a
+    9:10:void lambda$addProguardConfigurationFiles$5(java.util.List):206:207 -> a
+    11:11:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):377:377 -> a
+    12:14:void lambda$makeR8Command$7(com.android.tools.r8.DataResourceProvider$Visitor,com.android.tools.r8.utils.Reporter,com.android.tools.r8.DataResourceProvider):496:498 -> a
+    15:17:void lambda$addProguardConfigurationConsumerForTesting$8(java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):561:563 -> a
+    1:1:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):366:366 -> addFeatureSplit
     2:2:com.android.tools.r8.FeatureSplit$Builder com.android.tools.r8.FeatureSplit.builder(com.android.tools.r8.DiagnosticsHandler):50:50 -> addFeatureSplit
-    2:2:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):365 -> addFeatureSplit
-    3:5:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):365:367 -> addFeatureSplit
-    1:1:com.android.tools.r8.R8Command$Builder addMainDexRules(java.util.List,com.android.tools.r8.origin.Origin):187:187 -> addMainDexRules
-    1:1:com.android.tools.r8.R8Command$Builder addMainDexRulesFiles(java.nio.file.Path[]):167:167 -> addMainDexRulesFiles
-    2:2:com.android.tools.r8.R8Command$Builder addMainDexRulesFiles(java.util.Collection):177:177 -> addMainDexRulesFiles
+    2:2:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):366 -> addFeatureSplit
+    3:5:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):366:368 -> addFeatureSplit
+    1:1:com.android.tools.r8.R8Command$Builder addMainDexRules(java.util.List,com.android.tools.r8.origin.Origin):188:188 -> addMainDexRules
+    1:1:com.android.tools.r8.R8Command$Builder addMainDexRulesFiles(java.nio.file.Path[]):168:168 -> addMainDexRulesFiles
+    2:2:com.android.tools.r8.R8Command$Builder addMainDexRulesFiles(java.util.Collection):178:178 -> addMainDexRulesFiles
     1:1:com.android.tools.r8.BaseCommand$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):64:64 -> addProgramResourceProvider
-    2:2:com.android.tools.r8.R8Command$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):352:352 -> addProgramResourceProvider
-    1:1:com.android.tools.r8.R8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):214:214 -> addProguardConfiguration
-    1:2:void addProguardConfigurationConsumerForTesting(java.util.function.Consumer):556:557 -> addProguardConfigurationConsumerForTesting
-    1:1:com.android.tools.r8.R8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):194:194 -> addProguardConfigurationFiles
-    2:2:com.android.tools.r8.R8Command$Builder addProguardConfigurationFiles(java.util.List):204:204 -> addProguardConfigurationFiles
-    1:3:void addSyntheticProguardRulesConsumerForTesting(java.util.function.Consumer):569:571 -> addSyntheticProguardRulesConsumerForTesting
-    1:1:void allowTestProguardOptions():582:582 -> allowTestProguardOptions
+    2:2:com.android.tools.r8.R8Command$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):353:353 -> addProgramResourceProvider
+    1:1:com.android.tools.r8.R8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):215:215 -> addProguardConfiguration
+    1:2:void addProguardConfigurationConsumerForTesting(java.util.function.Consumer):557:558 -> addProguardConfigurationConsumerForTesting
+    1:1:com.android.tools.r8.R8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):195:195 -> addProguardConfigurationFiles
+    2:2:com.android.tools.r8.R8Command$Builder addProguardConfigurationFiles(java.util.List):205:205 -> addProguardConfigurationFiles
+    1:3:void addSyntheticProguardRulesConsumerForTesting(java.util.function.Consumer):570:572 -> addSyntheticProguardRulesConsumerForTesting
+    1:1:void allowTestProguardOptions():583:583 -> allowTestProguardOptions
     1:1:com.android.tools.r8.BaseCommand makeCommand():64:64 -> b
-    2:2:void setDisableVerticalClassMerging(boolean):130:130 -> b
-    3:4:void lambda$addProguardConfigurationFiles$4(java.nio.file.Path[]):195:196 -> b
-    5:6:void lambda$addProguardConfiguration$6(java.util.List,com.android.tools.r8.origin.Origin):214:215 -> b
-    7:7:void lambda$addProguardConfiguration$6(java.util.List,com.android.tools.r8.origin.Origin):214:214 -> b
-    8:11:com.android.tools.r8.R8Command makeCommand():427:430 -> b
-    12:12:com.android.tools.r8.R8Command makeCommand():428:428 -> b
+    2:2:void setDisableVerticalClassMerging(boolean):131:131 -> b
+    3:4:void lambda$addProguardConfigurationFiles$4(java.nio.file.Path[]):196:197 -> b
+    5:6:void lambda$addProguardConfiguration$6(java.util.List,com.android.tools.r8.origin.Origin):215:216 -> b
+    7:7:void lambda$addProguardConfiguration$6(java.util.List,com.android.tools.r8.origin.Origin):215:215 -> b
+    8:11:com.android.tools.r8.R8Command makeCommand():428:431 -> b
+    12:12:com.android.tools.r8.R8Command makeCommand():429:429 -> b
     com.android.tools.r8.BaseCommand$Builder self() -> c
-    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 -> 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
-    1:1:com.android.tools.r8.R8Command$Builder setKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):297:297 -> setKeptGraphConsumer
-    1:1:com.android.tools.r8.R8Command$Builder setMainDexKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):305:305 -> setMainDexKeptGraphConsumer
+    1:18:void validate():382:399 -> d
+    19:44:void validate():397:422 -> d
+    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():141:141 -> e
+    1:1:void internalForceProguardCompatibility():127:127 -> h
+    1:113:com.android.tools.r8.R8Command makeR8Command():435:547 -> i
+    1:1:com.android.tools.r8.R8Command$Builder setDesugaredLibraryKeepRuleConsumer(com.android.tools.r8.StringConsumer):255:255 -> setDesugaredLibraryKeepRuleConsumer
+    1:1:com.android.tools.r8.R8Command$Builder setDisableMinification(boolean):162:162 -> setDisableMinification
+    1:1:com.android.tools.r8.R8Command$Builder setDisableTreeShaking(boolean):151:151 -> setDisableTreeShaking
+    1:1:com.android.tools.r8.R8Command$Builder setKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):298:298 -> setKeptGraphConsumer
+    1:1:com.android.tools.r8.R8Command$Builder setMainDexKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):306:306 -> setMainDexKeptGraphConsumer
     1:1:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):64:64 -> setOutput
     2:2:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):64:64 -> setOutput
-    3:3:com.android.tools.r8.R8Command$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):324:324 -> setOutput
-    4:4:com.android.tools.r8.R8Command$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):347:347 -> setOutput
-    1:1:com.android.tools.r8.R8Command$Builder setProguardConfigurationConsumer(com.android.tools.r8.StringConsumer):289:289 -> setProguardConfigurationConsumer
-    1:1:com.android.tools.r8.R8Command$Builder setProguardMapConsumer(com.android.tools.r8.StringConsumer):243:243 -> setProguardMapConsumer
-    1:2:com.android.tools.r8.R8Command$Builder setProguardMapOutputPath(java.nio.file.Path):229:230 -> setProguardMapOutputPath
-    1:1:com.android.tools.r8.R8Command$Builder setProguardSeedsConsumer(com.android.tools.r8.StringConsumer):278:278 -> setProguardSeedsConsumer
-    1:1:com.android.tools.r8.R8Command$Builder setProguardUsageConsumer(com.android.tools.r8.StringConsumer):266:266 -> setProguardUsageConsumer
+    3:3:com.android.tools.r8.R8Command$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):325:325 -> setOutput
+    4:4:com.android.tools.r8.R8Command$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):348:348 -> setOutput
+    1:1:com.android.tools.r8.R8Command$Builder setProguardConfigurationConsumer(com.android.tools.r8.StringConsumer):290:290 -> setProguardConfigurationConsumer
+    1:1:com.android.tools.r8.R8Command$Builder setProguardMapConsumer(com.android.tools.r8.StringConsumer):244:244 -> setProguardMapConsumer
+    1:2:com.android.tools.r8.R8Command$Builder setProguardMapOutputPath(java.nio.file.Path):230:231 -> setProguardMapOutputPath
+    1:1:com.android.tools.r8.R8Command$Builder setProguardSeedsConsumer(com.android.tools.r8.StringConsumer):279:279 -> setProguardSeedsConsumer
+    1:1:com.android.tools.r8.R8Command$Builder setProguardUsageConsumer(com.android.tools.r8.StringConsumer):267:267 -> setProguardUsageConsumer
 com.android.tools.r8.R8Command$Builder$1 -> com.android.tools.r8.R8Command$Builder$a:
     com.android.tools.r8.shaking.ProguardConfigurationParser val$parser -> a
     com.android.tools.r8.utils.Reporter val$reporter -> b
-    1:1:void <init>(com.android.tools.r8.R8Command$Builder,com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.utils.Reporter):466:466 -> <init>
-    1:6:void visit(com.android.tools.r8.DataEntryResource):474:479 -> visit
-    7:15:void visit(com.android.tools.r8.DataEntryResource):475:483 -> visit
-    16:17:void visit(com.android.tools.r8.DataEntryResource):480:481 -> visit
-    18:18:void visit(com.android.tools.r8.DataEntryResource):480:480 -> visit
+    1:1:void <init>(com.android.tools.r8.R8Command$Builder,com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.utils.Reporter):467:467 -> <init>
+    1:6:void visit(com.android.tools.r8.DataEntryResource):475:480 -> visit
+    7:15:void visit(com.android.tools.r8.DataEntryResource):476:484 -> visit
+    16:17:void visit(com.android.tools.r8.DataEntryResource):481:482 -> visit
+    18:18:void visit(com.android.tools.r8.DataEntryResource):481:481 -> visit
 com.android.tools.r8.R8Command$Builder$DefaultR8DiagnosticsHandler -> com.android.tools.r8.R8Command$Builder$b:
     1:1:void <init>():67:67 -> <init>
     2:2:void <init>(com.android.tools.r8.R8Command$1):67:67 -> <init>
@@ -1345,12 +1348,12 @@
     7:14:void error(com.android.tools.r8.Diagnostic):74:81 -> error
 com.android.tools.r8.R8Command$EnsureNonDexProgramResourceProvider -> com.android.tools.r8.R8Command$b:
     com.android.tools.r8.ProgramResourceProvider provider -> a
-    1:2:void <init>(com.android.tools.r8.ProgramResourceProvider):591:592 -> <init>
-    1:1:com.android.tools.r8.DataResourceProvider getDataResourceProvider():609:609 -> getDataResourceProvider
-    1:4:java.util.Collection getProgramResources():597:600 -> getProgramResources
+    1:2:void <init>(com.android.tools.r8.ProgramResourceProvider):592:593 -> <init>
+    1:1:com.android.tools.r8.DataResourceProvider getDataResourceProvider():610:610 -> getDataResourceProvider
+    1:4:java.util.Collection getProgramResources():598:601 -> getProgramResources
 com.android.tools.r8.R8Command$StandardOutConsumer -> com.android.tools.r8.R8Command$c:
-    1:1:void <init>(com.android.tools.r8.StringConsumer):892:892 -> <init>
-    1:2:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):897:898 -> accept
+    1:1:void <init>(com.android.tools.r8.StringConsumer):893:893 -> <init>
+    1:2:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):898:899 -> accept
 com.android.tools.r8.R8CommandParser -> com.android.tools.r8.p:
     java.util.Set OPTIONS_WITH_PARAMETER -> a
     java.lang.String USAGE_MESSAGE -> b
@@ -1555,6 +1558,7 @@
     1:1:com.android.tools.r8.StringResource fromString(java.lang.String,com.android.tools.r8.origin.Origin):26:26 -> a
     2:2:com.android.tools.r8.StringResource fromFile(java.nio.file.Path):37:37 -> a
     3:3:com.android.tools.r8.StringResource fromFile(java.nio.file.Path,java.nio.charset.Charset):49:49 -> a
+    3:3:com.android.tools.r8.StringResource fromFile(java.nio.file.Path):37 -> a
 com.android.tools.r8.StringResource$1 -> com.android.tools.r8.q$a:
 com.android.tools.r8.StringResource$FileResource -> com.android.tools.r8.q$b:
     java.nio.charset.Charset charset -> b
@@ -2383,7 +2387,7 @@
     3:3:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):45:45 -> a
     4:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):56:57 -> a
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):56:56 -> a
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodHandle():276:276 -> a
+    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodHandle():275:275 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):66 -> a
     boolean canThrow() -> e
     1:1:com.android.tools.r8.graph.DexMethodHandle getHandle():30:30 -> q
@@ -2395,7 +2399,7 @@
     3:3:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexType):45:45 -> a
     4:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):56:57 -> a
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):56:56 -> a
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodType():280:280 -> a
+    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodType():279:279 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):66 -> a
     boolean canThrow() -> e
     1:1:com.android.tools.r8.graph.DexProto getType():30:30 -> q
@@ -2808,7 +2812,7 @@
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):35:35 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):40:40 -> a
     3:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):50:51 -> a
-    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():212:212 -> a
+    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():211:211 -> a
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):60 -> a
     boolean canThrow() -> e
     1:1:com.android.tools.r8.ir.code.Monitor$Type getType():30:30 -> q
@@ -2837,7 +2841,7 @@
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):36:36 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):41:41 -> a
     3:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):79:80 -> a
-    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():272:272 -> a
+    5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():271:271 -> a
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):89 -> a
     1:14:int getAsmOpcode():45:58 -> q
     1:1:com.android.tools.r8.ir.code.NumericType getType():31:31 -> r
@@ -2901,7 +2905,7 @@
     17:17:com.android.tools.r8.cf.code.CfNumberConversion fromAsm(int):116:116 -> a
     18:18:com.android.tools.r8.cf.code.CfNumberConversion fromAsm(int):114:114 -> a
     19:20:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):150:151 -> a
-    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():272:272 -> a
+    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():271:271 -> a
     21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):160 -> a
     1:53:int getAsmOpcode():55:107 -> q
     54:62:int getAsmOpcode():96:104 -> q
@@ -2929,7 +2933,7 @@
     14:14:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):58:58 -> a
     15:15:void print(com.android.tools.r8.cf.CfPrinter):63:63 -> a
     16:17:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):73:74 -> a
-    18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():244:244 -> a
+    18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():243:243 -> a
     18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):83 -> a
     boolean isJump() -> l
     boolean isReturn() -> o
@@ -2939,7 +2943,7 @@
     1:1:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):28:28 -> a
     2:2:void print(com.android.tools.r8.cf.CfPrinter):33:33 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):43:43 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():244:244 -> a
+    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():243:243 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):52 -> a
     boolean isJump() -> l
     boolean isReturn() -> o
@@ -3107,7 +3111,7 @@
     16:17:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):79:80 -> a
     18:18:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     18:18:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):80 -> a
-    19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStore():260:260 -> a
+    19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStore():259:259 -> a
     19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):94 -> a
     boolean emitsIR() -> f
     boolean isStore() -> p
@@ -12825,123 +12829,135 @@
     com.android.tools.r8.naming.NamingLens namingLens -> d
     java.util.List markerStrings -> g
     com.android.tools.r8.naming.ProguardMapSupplier proguardMapSupplier -> j
-    1:1:void <clinit>():70:70 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,java.util.List,com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):150:150 -> <init>
-    2:13:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,java.util.List,com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier,com.android.tools.r8.DexIndexedConsumer):171:182 -> <init>
-    1:1:void encodeChecksums(java.lang.Iterable):212:212 -> a
-    2:2:java.util.HashMap com.android.tools.r8.com.google.common.collect.Maps.newHashMap():283:283 -> a
+    1:1:void <clinit>():71:71 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,java.util.List,com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):151:151 -> <init>
+    2:13:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,java.util.List,com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier,com.android.tools.r8.DexIndexedConsumer):172:183 -> <init>
+    1:1:void encodeChecksums(java.lang.Iterable):213:213 -> a
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.dex.ClassesChecksum.getChecksums():40:40 -> a
     2:2:void encodeChecksums(java.lang.Iterable):213 -> a
-    3:6:void encodeChecksums(java.lang.Iterable):214:217 -> a
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    7:7:void encodeChecksums(java.lang.Iterable):218 -> a
-    8:11:void encodeChecksums(java.lang.Iterable):218:221 -> a
-    12:12:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    12:12:void encodeChecksums(java.lang.Iterable):221 -> a
-    13:25:void encodeChecksums(java.lang.Iterable):221:233 -> a
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    26:26:void encodeChecksums(java.lang.Iterable):234 -> a
-    27:31:void encodeChecksums(java.lang.Iterable):234:238 -> a
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    32:32:void encodeChecksums(java.lang.Iterable):239 -> a
-    33:49:void encodeChecksums(java.lang.Iterable):239:255 -> a
-    50:81:void write(java.util.concurrent.ExecutorService):260:291 -> a
-    82:94:void write(java.util.concurrent.ExecutorService):289:301 -> a
-    95:159:void write(java.util.concurrent.ExecutorService):300:364 -> a
-    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():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():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
-    190:195:com.android.tools.r8.dex.FileWriter$ByteBufferResult writeDexFile(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.ByteBufferProvider):620:625 -> a
-    190:195:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):328 -> a
-    196:204:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):329:337 -> a
-    205:215:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):334:344 -> a
-    216:225:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):341:350 -> a
-    226:229:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):377:380 -> a
-    230:236:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):378:384 -> a
-    237:239:boolean validateProguardMapParses(java.lang.String):487:489 -> a
-    237:239:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):384 -> a
-    240:247:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):384:391 -> a
-    248:295:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):390:437 -> a
-    296:296:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):436:436 -> a
-    297:297:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):413:413 -> a
-    298:307:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):412:421 -> a
-    308:316:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):416:424 -> a
-    317:317:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):415:415 -> a
-    318:318:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):414:414 -> a
-    319:352:void adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):447:480 -> a
-    353:366:void insertAttributeAnnotations():497:510 -> a
-    367:367:void insertAttributeAnnotations():509:509 -> a
-    368:376:void insertAttributeAnnotations():508:516 -> a
-    377:377:void insertAttributeAnnotations():515:515 -> a
-    378:394:void insertAttributeAnnotations():514:530 -> a
-    395:401:void insertAttributeAnnotations():529:535 -> a
-    402:411:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createInnerClassAnnotation(com.android.tools.r8.graph.DexString,int,com.android.tools.r8.graph.DexItemFactory):142:151 -> a
-    402:411:void insertAttributeAnnotations():533 -> a
-    412:420:void insertAttributeAnnotations():532:540 -> a
-    421:421:void insertAttributeAnnotations():539:539 -> a
-    422:433:void insertAttributeAnnotations():538:549 -> a
-    434:444:void insertAttributeAnnotations():548:558 -> a
-    445:445:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):72:72 -> a
-    445:445:void insertAttributeAnnotations():556 -> a
-    446:446:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Class,int):49:49 -> a
-    446:446:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):72 -> a
-    446:446:void insertAttributeAnnotations():556 -> a
-    447:448:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):73:74 -> a
-    447:448:void insertAttributeAnnotations():556 -> a
-    449:458:void insertAttributeAnnotations():556:565 -> a
-    459:461:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):581:583 -> a
-    462:462:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMethodBacking():21:21 -> a
-    462:462:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):584 -> a
-    463:464:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):587:588 -> a
-    465:465:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMethodBacking():21:21 -> a
-    465:465:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):589 -> a
-    466:469:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):594:597 -> a
-    470:470:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMapBacking(java.util.Map):25:25 -> a
-    470:470:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):613 -> a
-    471:481:void lambda$rewriteCodeWithJumboStrings$3(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexApplication,java.util.Map,boolean,com.android.tools.r8.graph.DexEncodedMethod):599:609 -> a
-    482:483:java.lang.String mapMainDexListName(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):629:630 -> a
-    482:483:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):638 -> a
-    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():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():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
+    3:3:java.util.HashMap com.android.tools.r8.com.google.common.collect.Maps.newHashMap():283:283 -> a
+    3:3:void encodeChecksums(java.lang.Iterable):214 -> a
+    4:7:void encodeChecksums(java.lang.Iterable):215:218 -> a
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
+    8:8:void encodeChecksums(java.lang.Iterable):219 -> a
+    9:18:void encodeChecksums(java.lang.Iterable):219:228 -> a
+    19:19:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    19:19:void encodeChecksums(java.lang.Iterable):228 -> a
+    20:20:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    20:20:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    20:20:void encodeChecksums(java.lang.Iterable):228 -> a
+    21:21:void encodeChecksums(java.lang.Iterable):228:228 -> a
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
+    22:22:void encodeChecksums(java.lang.Iterable):226 -> a
+    23:23:void encodeChecksums(java.lang.Iterable):226:226 -> a
+    24:43:void encodeChecksums(java.lang.Iterable):225:244 -> a
+    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
+    44:44:void encodeChecksums(java.lang.Iterable):245 -> a
+    45:49:void encodeChecksums(java.lang.Iterable):245:249 -> a
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
+    50:50:void encodeChecksums(java.lang.Iterable):250 -> a
+    51:64:void encodeChecksums(java.lang.Iterable):250:263 -> a
+    65:65:com.android.tools.r8.dex.ClassesChecksum com.android.tools.r8.dex.ClassesChecksum.addChecksum(java.lang.String,java.lang.Long):35:35 -> a
+    65:65:void encodeChecksums(java.lang.Iterable):264 -> a
+    66:66:void encodeChecksums(java.lang.Iterable):266:266 -> a
+    67:98:void write(java.util.concurrent.ExecutorService):271:302 -> a
+    99:111:void write(java.util.concurrent.ExecutorService):300:312 -> a
+    112:176:void write(java.util.concurrent.ExecutorService):311:375 -> a
+    177:185:void write(java.util.concurrent.ExecutorService):369:377 -> a
+    186:186:void lambda$write$0(com.android.tools.r8.dex.ApplicationWriter$SortAnnotations,com.android.tools.r8.graph.DexProgramClass):305:305 -> a
+    187:191:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):316:320 -> a
+    192:192:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():340:340 -> a
+    192:192:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):320 -> a
+    193:200:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):323:330 -> a
+    201:201:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():336:336 -> a
+    201:201:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):330 -> a
+    202:205:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):334:337 -> a
+    206:206:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):336:336 -> a
+    207:212:com.android.tools.r8.dex.FileWriter$ByteBufferResult writeDexFile(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.dex.MethodToCodeObjectMapping,com.android.tools.r8.ByteBufferProvider):631:636 -> a
+    207:212:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):339 -> a
+    213:221:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):340:348 -> a
+    222:232:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):345:355 -> a
+    233:242:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):352:361 -> a
+    243:246:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):388:391 -> a
+    247:253:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):389:395 -> a
+    254:256:boolean validateProguardMapParses(java.lang.String):498:500 -> a
+    254:256:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):395 -> a
+    257:264:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):395:402 -> a
+    265:312:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):401:448 -> a
+    313:313:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,java.lang.String):447:447 -> a
+    314:314:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):424:424 -> a
+    315:324:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):423:432 -> a
+    325:333:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):427:435 -> a
+    334:334:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):426:426 -> a
+    335:335:void lambda$supplyAdditionalConsumers$2(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):425:425 -> a
+    336:369:void adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):458:491 -> a
+    370:383:void insertAttributeAnnotations():508:521 -> a
+    384:384:void insertAttributeAnnotations():520:520 -> a
+    385:393:void insertAttributeAnnotations():519:527 -> a
+    394:394:void insertAttributeAnnotations():526:526 -> a
+    395:411:void insertAttributeAnnotations():525:541 -> a
+    412:418:void insertAttributeAnnotations():540:546 -> a
+    419:428:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createInnerClassAnnotation(com.android.tools.r8.graph.DexString,int,com.android.tools.r8.graph.DexItemFactory):142:151 -> a
+    419:428:void insertAttributeAnnotations():544 -> a
+    429:437:void insertAttributeAnnotations():543:551 -> a
+    438:438:void insertAttributeAnnotations():550:550 -> a
+    439:450:void insertAttributeAnnotations():549:560 -> a
+    451:461:void insertAttributeAnnotations():559:569 -> a
+    462:462:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):72:72 -> a
+    462:462:void insertAttributeAnnotations():567 -> a
+    463:463:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Class,int):49:49 -> a
+    463:463:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):72 -> a
+    463:463:void insertAttributeAnnotations():567 -> a
+    464:465:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):73:74 -> a
+    464:465:void insertAttributeAnnotations():567 -> a
+    466:475:void insertAttributeAnnotations():567:576 -> a
+    476:478:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):592:594 -> a
+    479:479:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMethodBacking():21:21 -> a
+    479:479:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):595 -> a
+    480:481:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):598:599 -> a
+    482:482:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMethodBacking():21:21 -> a
+    482:482:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):600 -> a
+    483:486:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):605:608 -> a
+    487:487:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMapBacking(java.util.Map):25:25 -> a
+    487:487:com.android.tools.r8.dex.MethodToCodeObjectMapping rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):624 -> a
+    488:498:void lambda$rewriteCodeWithJumboStrings$3(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexApplication,java.util.Map,boolean,com.android.tools.r8.graph.DexEncodedMethod):610:620 -> a
+    499:500:java.lang.String mapMainDexListName(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):640:641 -> a
+    499:500:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):649 -> a
+    501:501:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):649:649 -> a
+    502:507:java.lang.String writeMainDexList(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):645:650 -> a
+    1:1:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):190:190 -> b
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():328:328 -> b
+    2:2:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):190 -> b
+    3:3:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):191:191 -> b
+    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():340:340 -> b
+    4:4:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):192 -> b
+    5:15:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):192:202 -> b
 com.android.tools.r8.dex.ApplicationWriter$1 -> com.android.tools.r8.dex.b$a:
     com.android.tools.r8.dex.ResourceAdapter val$resourceAdapter -> a
     com.android.tools.r8.DataResourceConsumer val$dataResourceConsumer -> b
     java.util.Set val$generatedResourceNames -> d
     com.android.tools.r8.utils.InternalOptions val$options -> c
-    1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,java.util.Set):452:452 -> <init>
-    1:4:void visit(com.android.tools.r8.DataDirectoryResource):455:458 -> visit
-    5:5:void visit(com.android.tools.r8.DataEntryResource):464:464 -> visit
+    1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,java.util.Set):463:463 -> <init>
+    1:4:void visit(com.android.tools.r8.DataDirectoryResource):466:469 -> visit
+    5:5:void visit(com.android.tools.r8.DataEntryResource):475:475 -> visit
     6:6:boolean com.android.tools.r8.dex.ResourceAdapter.isService(com.android.tools.r8.DataEntryResource):97:97 -> visit
-    6:6:void visit(com.android.tools.r8.DataEntryResource):464 -> visit
-    7:12:void visit(com.android.tools.r8.DataEntryResource):469:474 -> visit
-    13:16:void visit(com.android.tools.r8.DataEntryResource):473:476 -> visit
+    6:6:void visit(com.android.tools.r8.DataEntryResource):475 -> visit
+    7:12:void visit(com.android.tools.r8.DataEntryResource):480:485 -> visit
+    13:16:void visit(com.android.tools.r8.DataEntryResource):484:487 -> visit
     17:17:boolean com.android.tools.r8.dex.ResourceAdapter.isService(com.android.tools.r8.DataEntryResource):97:97 -> visit
-    17:17:void visit(com.android.tools.r8.DataEntryResource):464 -> visit
+    17:17:void visit(com.android.tools.r8.DataEntryResource):475 -> visit
 com.android.tools.r8.dex.ApplicationWriter$SortAnnotations -> com.android.tools.r8.dex.b$b:
-    1:1:void <init>():84:84 -> <init>
-    2:2:void <init>(com.android.tools.r8.dex.ApplicationWriter$1):84:84 -> <init>
+    1:1:void <init>():85:85 -> <init>
+    2:2:void <init>(com.android.tools.r8.dex.ApplicationWriter$1):85:85 -> <init>
     boolean add(com.android.tools.r8.graph.DexCode) -> a
     boolean add(com.android.tools.r8.graph.DexDebugInfo) -> a
     boolean add(com.android.tools.r8.graph.DexProgramClass) -> a
     boolean add(com.android.tools.r8.graph.DexTypeList) -> a
     boolean add(com.android.tools.r8.graph.ParameterAnnotationsList) -> a
     boolean setAnnotationsDirectoryForClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationDirectory) -> a
-    1:1:boolean add(com.android.tools.r8.graph.DexAnnotationSet):89:89 -> a
-    2:2:boolean add(com.android.tools.r8.graph.DexAnnotation):96:96 -> a
-    3:4:boolean add(com.android.tools.r8.graph.DexEncodedArray):103:104 -> a
+    1:1:boolean add(com.android.tools.r8.graph.DexAnnotationSet):90:90 -> a
+    2:2:boolean add(com.android.tools.r8.graph.DexAnnotation):97:97 -> a
+    3:4:boolean add(com.android.tools.r8.graph.DexEncodedArray):104:105 -> a
 com.android.tools.r8.dex.BinaryReader -> com.android.tools.r8.dex.BinaryReader:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.dex.CompatByteBuffer buffer -> b
@@ -12965,17 +12981,16 @@
     3:3:void <init>(com.android.tools.r8.com.google.gson.JsonObject):29:29 -> <init>
     4:13:void <init>(com.android.tools.r8.com.google.gson.JsonObject):21:30 -> <init>
     1:1:com.android.tools.r8.dex.ClassesChecksum addChecksum(java.lang.String,java.lang.Long):35:35 -> a
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap getChecksums():40:40 -> a
-    3:4:void lambda$merge$1(java.util.Map$Entry):45:46 -> a
-    5:5:void lambda$merge$1(java.util.Map$Entry):45:45 -> a
-    6:6:com.android.tools.r8.dex.ClassesChecksum merge(com.android.tools.r8.dex.ClassesChecksum):45:45 -> a
-    7:7:void lambda$toString$2(com.android.tools.r8.com.google.gson.JsonObject,java.util.Map$Entry):59:59 -> a
-    8:14:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):66:72 -> a
-    15:15:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonObject():55:55 -> a
-    15:15:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):73 -> a
-    16:16:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):74:74 -> a
-    17:17:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonObject():55:55 -> a
-    17:17:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):73 -> a
+    2:3:void lambda$merge$1(java.util.Map$Entry):45:46 -> a
+    4:4:void lambda$merge$1(java.util.Map$Entry):45:45 -> a
+    5:5:com.android.tools.r8.dex.ClassesChecksum merge(com.android.tools.r8.dex.ClassesChecksum):45:45 -> a
+    6:6:void lambda$toString$2(com.android.tools.r8.com.google.gson.JsonObject,java.util.Map$Entry):59:59 -> a
+    7:13:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):66:72 -> a
+    14:14:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonObject():55:55 -> a
+    14:14:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):73 -> a
+    15:15:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):74:74 -> a
+    16:16:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonObject():55:55 -> a
+    16:16:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):73 -> a
     1:1:void lambda$new$0(java.util.Map$Entry):31:31 -> b
     1:7:java.lang.String toString():54:60 -> toString
 com.android.tools.r8.dex.CodeToKeep -> com.android.tools.r8.dex.f:
@@ -12986,7 +13001,7 @@
     void recordField(com.android.tools.r8.graph.DexField) -> a
     void recordMethod(com.android.tools.r8.graph.DexMethod) -> a
     1:2:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):24:25 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     3:3:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):26 -> a
     4:6:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):27:29 -> a
 com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep -> com.android.tools.r8.dex.d:
@@ -13305,7 +13320,7 @@
     150:150:void ensureCodesInited(int):159 -> a
     150:150:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):640 -> a
     151:165:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):641:655 -> a
-    166:166:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    166:166:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     166:166:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):655 -> a
     167:170:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):656:659 -> a
     171:171:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
@@ -13386,98 +13401,101 @@
     350:350:boolean com.android.tools.r8.dex.ClassesChecksum.preceedChecksumMarker(com.android.tools.r8.graph.DexString):82:82 -> a
     350:350:void populateChecksums():952 -> a
     350:350:void populateIndexTables():900 -> a
-    351:351:void populateChecksums():957:957 -> a
+    351:351:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.dex.ClassesChecksum.getChecksums():40:40 -> a
+    351:351:void populateChecksums():957 -> a
     351:351:void populateIndexTables():900 -> a
-    352:353:void populateTypes():933:934 -> a
-    352:353:void populateIndexTables():901 -> a
-    354:373:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):967:986 -> a
-    354:373:void populateTypes():934 -> a
-    354:373:void populateIndexTables():901 -> a
-    374:374:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):981:981 -> a
-    374:374:void populateTypes():934 -> a
-    374:374:void populateIndexTables():901 -> a
-    375:377:void populateTypes():935:937 -> a
-    375:377:void populateIndexTables():901 -> a
-    378:384:com.android.tools.r8.graph.DexType typeAt(int):1157:1163 -> a
-    378:384:void populateTypes():937 -> a
-    378:384:void populateIndexTables():901 -> a
-    385:385:void populateTypes():937:937 -> a
-    385:385:void populateIndexTables():901 -> a
-    386:387:void populateFields():995:996 -> a
-    386:387:void populateIndexTables():902 -> a
-    388:423:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1011:1046 -> a
-    388:423:void populateFields():996 -> a
-    388:423:void populateIndexTables():902 -> a
-    424:434:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1043:1053 -> a
-    424:434:void populateFields():996 -> a
-    424:434:void populateIndexTables():902 -> a
-    435:439:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1050:1054 -> a
-    435:439:void populateFields():996 -> a
-    435:439:void populateIndexTables():902 -> a
-    440:440:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1039:1039 -> a
-    440:440:void populateFields():996 -> a
-    440:440:void populateIndexTables():902 -> a
-    441:443:void populateFields():997:999 -> a
-    441:443:void populateIndexTables():902 -> a
-    444:456:com.android.tools.r8.graph.DexField fieldAt(int):1167:1179 -> a
-    444:456:void populateFields():999 -> a
-    444:456:void populateIndexTables():902 -> a
-    457:457:void populateFields():999:999 -> a
-    457:457:void populateIndexTables():902 -> a
-    458:461:void populateProtos():1065:1068 -> a
-    458:461:void populateIndexTables():903 -> a
-    462:474:com.android.tools.r8.graph.DexProto protoAt(int):1240:1252 -> a
-    462:474:void populateProtos():1068 -> a
-    462:474:void populateIndexTables():903 -> a
-    475:475:void populateProtos():1068:1068 -> a
-    475:475:void populateIndexTables():903 -> a
-    476:477:void populateMethods():1073:1074 -> a
-    476:477:void populateIndexTables():904 -> a
-    478:513:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1090:1125 -> a
-    478:513:void populateMethods():1074 -> a
-    478:513:void populateIndexTables():904 -> a
-    514:524:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1122:1132 -> a
-    514:524:void populateMethods():1074 -> a
-    514:524:void populateIndexTables():904 -> a
-    525:529:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1129:1133 -> a
-    525:529:void populateMethods():1074 -> a
-    525:529:void populateIndexTables():904 -> a
-    530:530:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1118:1118 -> a
-    530:530:void populateMethods():1074 -> a
-    530:530:void populateIndexTables():904 -> a
-    531:533:void populateMethods():1075:1077 -> a
-    531:533:void populateIndexTables():904 -> a
-    534:546:com.android.tools.r8.graph.DexMethod methodAt(int):1256:1268 -> a
-    534:546:void populateMethods():1077 -> a
-    534:546:void populateIndexTables():904 -> a
-    547:547:com.android.tools.r8.graph.DexMethod methodAt(int):1265:1265 -> a
-    547:547:void populateMethods():1077 -> a
-    547:547:void populateIndexTables():904 -> a
-    548:548:void populateMethods():1077:1077 -> a
+    352:352:void populateChecksums():957:957 -> a
+    352:352:void populateIndexTables():900 -> a
+    353:354:void populateTypes():933:934 -> a
+    353:354:void populateIndexTables():901 -> a
+    355:374:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):967:986 -> a
+    355:374:void populateTypes():934 -> a
+    355:374:void populateIndexTables():901 -> a
+    375:375:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):981:981 -> a
+    375:375:void populateTypes():934 -> a
+    375:375:void populateIndexTables():901 -> a
+    376:378:void populateTypes():935:937 -> a
+    376:378:void populateIndexTables():901 -> a
+    379:385:com.android.tools.r8.graph.DexType typeAt(int):1157:1163 -> a
+    379:385:void populateTypes():937 -> a
+    379:385:void populateIndexTables():901 -> a
+    386:386:void populateTypes():937:937 -> a
+    386:386:void populateIndexTables():901 -> a
+    387:388:void populateFields():995:996 -> a
+    387:388:void populateIndexTables():902 -> a
+    389:424:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1011:1046 -> a
+    389:424:void populateFields():996 -> a
+    389:424:void populateIndexTables():902 -> a
+    425:435:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1043:1053 -> a
+    425:435:void populateFields():996 -> a
+    425:435:void populateIndexTables():902 -> a
+    436:440:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1050:1054 -> a
+    436:440:void populateFields():996 -> a
+    436:440:void populateIndexTables():902 -> a
+    441:441:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1039:1039 -> a
+    441:441:void populateFields():996 -> a
+    441:441:void populateIndexTables():902 -> a
+    442:444:void populateFields():997:999 -> a
+    442:444:void populateIndexTables():902 -> a
+    445:457:com.android.tools.r8.graph.DexField fieldAt(int):1167:1179 -> a
+    445:457:void populateFields():999 -> a
+    445:457:void populateIndexTables():902 -> a
+    458:458:void populateFields():999:999 -> a
+    458:458:void populateIndexTables():902 -> a
+    459:462:void populateProtos():1065:1068 -> a
+    459:462:void populateIndexTables():903 -> a
+    463:475:com.android.tools.r8.graph.DexProto protoAt(int):1240:1252 -> a
+    463:475:void populateProtos():1068 -> a
+    463:475:void populateIndexTables():903 -> a
+    476:476:void populateProtos():1068:1068 -> a
+    476:476:void populateIndexTables():903 -> a
+    477:478:void populateMethods():1073:1074 -> a
+    477:478:void populateIndexTables():904 -> a
+    479:514:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1090:1125 -> a
+    479:514:void populateMethods():1074 -> a
+    479:514:void populateIndexTables():904 -> a
+    515:525:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1122:1132 -> a
+    515:525:void populateMethods():1074 -> a
+    515:525:void populateIndexTables():904 -> a
+    526:530:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1129:1133 -> a
+    526:530:void populateMethods():1074 -> a
+    526:530:void populateIndexTables():904 -> a
+    531:531:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1118:1118 -> a
+    531:531:void populateMethods():1074 -> a
+    531:531:void populateIndexTables():904 -> a
+    532:534:void populateMethods():1075:1077 -> a
+    532:534:void populateIndexTables():904 -> a
+    535:547:com.android.tools.r8.graph.DexMethod methodAt(int):1256:1268 -> a
+    535:547:void populateMethods():1077 -> a
+    535:547:void populateIndexTables():904 -> a
+    548:548:com.android.tools.r8.graph.DexMethod methodAt(int):1265:1265 -> a
+    548:548:void populateMethods():1077 -> a
     548:548:void populateIndexTables():904 -> a
-    549:552:void populateMethodHandles():917:920 -> a
-    549:552:void populateIndexTables():905 -> a
-    553:580:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1183:1210 -> a
-    553:580:void populateMethodHandles():920 -> a
-    553:580:void populateIndexTables():905 -> a
-    581:581:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1206:1206 -> a
-    581:581:void populateMethodHandles():920 -> a
-    581:581:void populateIndexTables():905 -> a
-    582:598:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1198:1214 -> a
-    582:598:void populateMethodHandles():920 -> a
-    582:598:void populateIndexTables():905 -> a
-    599:599:void populateMethodHandles():920:920 -> a
-    599:599:void populateIndexTables():905 -> a
-    600:603:void populateCallSites():925:928 -> a
-    600:603:void populateIndexTables():906 -> a
-    604:621:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1219:1236 -> a
-    604:621:void populateCallSites():928 -> a
-    604:621:void populateIndexTables():906 -> a
-    622:622:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1231:1231 -> a
-    622:622:void populateCallSites():928 -> a
-    622:622:void populateIndexTables():906 -> a
-    623:623:void populateCallSites():928:928 -> a
+    549:549:void populateMethods():1077:1077 -> a
+    549:549:void populateIndexTables():904 -> a
+    550:553:void populateMethodHandles():917:920 -> a
+    550:553:void populateIndexTables():905 -> a
+    554:581:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1183:1210 -> a
+    554:581:void populateMethodHandles():920 -> a
+    554:581:void populateIndexTables():905 -> a
+    582:582:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1206:1206 -> a
+    582:582:void populateMethodHandles():920 -> a
+    582:582:void populateIndexTables():905 -> a
+    583:599:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1198:1214 -> a
+    583:599:void populateMethodHandles():920 -> a
+    583:599:void populateIndexTables():905 -> a
+    600:600:void populateMethodHandles():920:920 -> a
+    600:600:void populateIndexTables():905 -> a
+    601:604:void populateCallSites():925:928 -> a
+    601:604:void populateIndexTables():906 -> a
+    605:622:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1219:1236 -> a
+    605:622:void populateCallSites():928 -> a
+    605:622:void populateIndexTables():906 -> a
+    623:623:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1231:1231 -> a
+    623:623:void populateCallSites():928 -> a
     623:623:void populateIndexTables():906 -> a
+    624:624:void populateCallSites():928:928 -> a
+    624:624:void populateIndexTables():906 -> a
     1:2:com.android.tools.r8.graph.DexAnnotation parseAnnotation():424:425 -> b
     3:3:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> b
     3:3:com.android.tools.r8.graph.DexAnnotation parseAnnotation():425 -> b
@@ -13746,131 +13764,137 @@
     7:7:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):121:121 -> a
     8:8:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
     8:8:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):121 -> a
-    9:11:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):122:124 -> a
-    12:12:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    12:12:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):124 -> a
-    13:13:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):125:125 -> a
+    9:9:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):122:122 -> a
+    10:10:boolean com.android.tools.r8.graph.PresortedComparable.isSorted(java.lang.Object[],java.util.function.Function):19:19 -> a
+    10:10:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):122 -> a
+    11:13:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):122:124 -> a
     14:14:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    14:14:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):120 -> a
-    15:15:com.android.tools.r8.graph.DexString lambda$writeEncodedAnnotation$0(com.android.tools.r8.graph.DexAnnotationElement):122:122 -> a
-    16:36:com.android.tools.r8.dex.FileWriter collect():131:151 -> a
-    37:74:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):256:293 -> a
-    75:75:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    75:75:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):293 -> a
-    76:76:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):293:293 -> a
-    77:78:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):269:270 -> a
-    79:79:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    79:79:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):270 -> a
-    80:80:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):270:270 -> a
-    81:86:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):324:329 -> a
-    87:93:void addSignaturesFromMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,java.util.Map,com.android.tools.r8.naming.ClassNameMapper):345:351 -> a
-    87:93:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):328 -> a
-    94:96:void writeFixedSectionItems(java.util.Collection,int,java.util.function.Consumer):356:358 -> a
-    97:101:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer,int):377:381 -> a
-    102:103:void writeTypeItem(com.android.tools.r8.graph.DexType):430:431 -> a
-    104:106:void writeProtoItem(com.android.tools.r8.graph.DexProto):435:437 -> a
-    107:114:void writeFieldItem(com.android.tools.r8.graph.DexField):441:448 -> a
-    115:122:void writeMethodItem(com.android.tools.r8.graph.DexMethod):452:459 -> a
-    123:124:void writeDebugItem(com.android.tools.r8.graph.DexDebugInfo):477:478 -> a
-    125:139:void writeCodeItem(com.android.tools.r8.graph.DexCode):482:496 -> a
-    140:140:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    140:140:void writeCodeItem(com.android.tools.r8.graph.DexCode):496 -> a
-    141:149:void writeCodeItem(com.android.tools.r8.graph.DexCode):497:505 -> a
-    150:150:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    150:150:void writeCodeItem(com.android.tools.r8.graph.DexCode):505 -> a
-    151:156:void writeCodeItem(com.android.tools.r8.graph.DexCode):506:511 -> a
-    157:157:void com.android.tools.r8.dex.DexOutputBuffer.putSleb128(int):84:84 -> a
-    157:157:void writeCodeItem(com.android.tools.r8.graph.DexCode):511 -> a
-    158:159:void writeCodeItem(com.android.tools.r8.graph.DexCode):512:513 -> a
-    160:160:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    160:160:void writeCodeItem(com.android.tools.r8.graph.DexCode):513 -> a
-    161:161:void writeCodeItem(com.android.tools.r8.graph.DexCode):514:514 -> a
+    14:14:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):124 -> a
+    15:15:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):125:125 -> a
+    16:16:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    16:16:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):120 -> a
+    17:17:com.android.tools.r8.graph.DexString lambda$writeEncodedAnnotation$0(com.android.tools.r8.graph.DexAnnotationElement):122:122 -> a
+    18:38:com.android.tools.r8.dex.FileWriter collect():131:151 -> a
+    39:76:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):256:293 -> a
+    77:77:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    77:77:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):293 -> a
+    78:78:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):293:293 -> a
+    79:80:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):269:270 -> a
+    81:81:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    81:81:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):270 -> a
+    82:82:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):270:270 -> a
+    83:88:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):324:329 -> a
+    89:95:void addSignaturesFromMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,java.util.Map,com.android.tools.r8.naming.ClassNameMapper):345:351 -> a
+    89:95:void lambda$sortDexCodesByClassName$1(java.util.List,java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):328 -> a
+    96:98:void writeFixedSectionItems(java.util.Collection,int,java.util.function.Consumer):356:358 -> a
+    99:103:void writeItems(java.util.Collection,java.util.function.Consumer,java.util.function.Consumer,int):377:381 -> a
+    104:105:void writeTypeItem(com.android.tools.r8.graph.DexType):430:431 -> a
+    106:108:void writeProtoItem(com.android.tools.r8.graph.DexProto):435:437 -> a
+    109:116:void writeFieldItem(com.android.tools.r8.graph.DexField):441:448 -> a
+    117:124:void writeMethodItem(com.android.tools.r8.graph.DexMethod):452:459 -> a
+    125:126:void writeDebugItem(com.android.tools.r8.graph.DexDebugInfo):477:478 -> a
+    127:141:void writeCodeItem(com.android.tools.r8.graph.DexCode):482:496 -> a
+    142:142:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
+    142:142:void writeCodeItem(com.android.tools.r8.graph.DexCode):496 -> a
+    143:151:void writeCodeItem(com.android.tools.r8.graph.DexCode):497:505 -> a
+    152:152:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    152:152:void writeCodeItem(com.android.tools.r8.graph.DexCode):505 -> a
+    153:158:void writeCodeItem(com.android.tools.r8.graph.DexCode):506:511 -> a
+    159:159:void com.android.tools.r8.dex.DexOutputBuffer.putSleb128(int):84:84 -> a
+    159:159:void writeCodeItem(com.android.tools.r8.graph.DexCode):511 -> a
+    160:161:void writeCodeItem(com.android.tools.r8.graph.DexCode):512:513 -> a
     162:162:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    162:162:void writeCodeItem(com.android.tools.r8.graph.DexCode):514 -> a
-    163:163:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    163:163:void writeCodeItem(com.android.tools.r8.graph.DexCode):513 -> a
-    164:164:void writeCodeItem(com.android.tools.r8.graph.DexCode):517:517 -> a
+    162:162:void writeCodeItem(com.android.tools.r8.graph.DexCode):513 -> a
+    163:163:void writeCodeItem(com.android.tools.r8.graph.DexCode):514:514 -> a
+    164:164:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    164:164:void writeCodeItem(com.android.tools.r8.graph.DexCode):514 -> a
     165:165:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    165:165:void writeCodeItem(com.android.tools.r8.graph.DexCode):517 -> a
-    166:166:void com.android.tools.r8.dex.DexOutputBuffer.putSleb128(int):84:84 -> a
-    166:166:void writeCodeItem(com.android.tools.r8.graph.DexCode):511 -> a
-    167:176:void writeCodeItem(com.android.tools.r8.graph.DexCode):520:529 -> a
-    177:177:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    177:177:void writeCodeItem(com.android.tools.r8.graph.DexCode):505 -> a
-    178:183:void writeTypeList(com.android.tools.r8.graph.DexTypeList):534:539 -> a
-    184:185:void writeStringData(com.android.tools.r8.graph.DexString):544:545 -> a
-    186:186:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    186:186:void writeStringData(com.android.tools.r8.graph.DexString):545 -> a
-    187:187:void writeStringData(com.android.tools.r8.graph.DexString):546:546 -> a
+    165:165:void writeCodeItem(com.android.tools.r8.graph.DexCode):513 -> a
+    166:166:void writeCodeItem(com.android.tools.r8.graph.DexCode):517:517 -> a
+    167:167:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    167:167:void writeCodeItem(com.android.tools.r8.graph.DexCode):517 -> a
+    168:168:void com.android.tools.r8.dex.DexOutputBuffer.putSleb128(int):84:84 -> a
+    168:168:void writeCodeItem(com.android.tools.r8.graph.DexCode):511 -> a
+    169:178:void writeCodeItem(com.android.tools.r8.graph.DexCode):520:529 -> a
+    179:179:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    179:179:void writeCodeItem(com.android.tools.r8.graph.DexCode):505 -> a
+    180:185:void writeTypeList(com.android.tools.r8.graph.DexTypeList):534:539 -> a
+    186:187:void writeStringData(com.android.tools.r8.graph.DexString):544:545 -> a
     188:188:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
     188:188:void writeStringData(com.android.tools.r8.graph.DexString):545 -> a
-    189:189:com.android.tools.r8.graph.DexType lambda$writeAnnotationSet$2(com.android.tools.r8.graph.DexAnnotation):559:559 -> a
-    190:194:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):559:563 -> a
-    195:195:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    195:195:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):563 -> a
-    196:198:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):565:567 -> a
-    199:208:void writeAnnotationSetRefList(com.android.tools.r8.graph.ParameterAnnotationsList):572:581 -> a
-    209:211:void writeMemberAnnotations(java.util.List,java.util.function.ToIntFunction):587:589 -> a
-    212:224:void writeAnnotationDirectory(com.android.tools.r8.graph.DexAnnotationDirectory):594:606 -> a
-    225:225:int lambda$writeAnnotationDirectory$3(com.android.tools.r8.graph.DexEncodedField):603:603 -> a
-    226:231:void writeEncodedFields(java.util.List):611:616 -> a
-    232:232:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    232:232:void writeEncodedFields(java.util.List):616 -> a
-    233:233:void writeEncodedFields(java.util.List):618:618 -> a
-    234:234:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    234:234:void writeEncodedFields(java.util.List):618 -> a
-    235:235:void writeEncodedFields(java.util.List):619:619 -> a
+    189:189:void writeStringData(com.android.tools.r8.graph.DexString):546:546 -> a
+    190:190:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    190:190:void writeStringData(com.android.tools.r8.graph.DexString):545 -> a
+    191:191:com.android.tools.r8.graph.DexType lambda$writeAnnotationSet$2(com.android.tools.r8.graph.DexAnnotation):559:559 -> a
+    192:192:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):559:559 -> a
+    193:193:boolean com.android.tools.r8.graph.PresortedComparable.isSorted(java.lang.Object[],java.util.function.Function):19:19 -> a
+    193:193:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):559 -> a
+    194:198:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):559:563 -> a
+    199:199:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    199:199:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):563 -> a
+    200:202:void writeAnnotationSet(com.android.tools.r8.graph.DexAnnotationSet):565:567 -> a
+    203:212:void writeAnnotationSetRefList(com.android.tools.r8.graph.ParameterAnnotationsList):572:581 -> a
+    213:215:void writeMemberAnnotations(java.util.List,java.util.function.ToIntFunction):587:589 -> a
+    216:228:void writeAnnotationDirectory(com.android.tools.r8.graph.DexAnnotationDirectory):594:606 -> a
+    229:229:int lambda$writeAnnotationDirectory$3(com.android.tools.r8.graph.DexEncodedField):603:603 -> a
+    230:235:void writeEncodedFields(java.util.List):611:616 -> a
     236:236:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    236:236:void writeEncodedFields(java.util.List):618 -> a
-    237:237:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    237:237:void writeEncodedFields(java.util.List):616 -> a
-    238:243:void writeEncodedMethods(java.util.List,boolean):624:629 -> a
-    244:244:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    244:244:void writeEncodedMethods(java.util.List,boolean):629 -> a
-    245:245:void writeEncodedMethods(java.util.List,boolean):631:631 -> a
-    246:246:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    246:246:void writeEncodedMethods(java.util.List,boolean):631 -> a
-    247:251:void writeEncodedMethods(java.util.List,boolean):632:636 -> a
-    252:252:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    252:252:void writeEncodedMethods(java.util.List,boolean):636 -> a
-    253:253:void writeEncodedMethods(java.util.List,boolean):638:638 -> a
-    254:254:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    254:254:void writeEncodedMethods(java.util.List,boolean):638 -> a
-    255:255:void writeEncodedMethods(java.util.List,boolean):641:641 -> a
+    236:236:void writeEncodedFields(java.util.List):616 -> a
+    237:237:void writeEncodedFields(java.util.List):618:618 -> a
+    238:238:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    238:238:void writeEncodedFields(java.util.List):618 -> a
+    239:239:void writeEncodedFields(java.util.List):619:619 -> a
+    240:240:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    240:240:void writeEncodedFields(java.util.List):618 -> a
+    241:241:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    241:241:void writeEncodedFields(java.util.List):616 -> a
+    242:247:void writeEncodedMethods(java.util.List,boolean):624:629 -> a
+    248:248:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    248:248:void writeEncodedMethods(java.util.List,boolean):629 -> a
+    249:249:void writeEncodedMethods(java.util.List,boolean):631:631 -> a
+    250:250:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    250:250:void writeEncodedMethods(java.util.List,boolean):631 -> a
+    251:255:void writeEncodedMethods(java.util.List,boolean):632:636 -> a
     256:256:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    256:256:void writeEncodedMethods(java.util.List,boolean):638 -> a
-    257:257:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    257:257:void writeEncodedMethods(java.util.List,boolean):631 -> a
+    256:256:void writeEncodedMethods(java.util.List,boolean):636 -> a
+    257:257:void writeEncodedMethods(java.util.List,boolean):638:638 -> a
     258:258:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    258:258:void writeEncodedMethods(java.util.List,boolean):629 -> a
-    259:265:void addStaticFieldValues(com.android.tools.r8.graph.DexProgramClass):665:671 -> a
-    266:268:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):708:710 -> a
-    269:269:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    269:269:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):710 -> a
-    270:270:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):712:712 -> a
-    271:271:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    271:271:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):712 -> a
-    272:273:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):713:714 -> a
-    274:274:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    274:274:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):712 -> a
-    275:281:int writeMapItem(int,int,int):722:728 -> a
-    282:282:void checkThatInvokeCustomIsAllowed():1370:1370 -> a
-    282:282:void writeCallSite(com.android.tools.r8.graph.DexCallSite):702 -> a
-    283:284:void writeCallSite(com.android.tools.r8.graph.DexCallSite):703:704 -> a
-    285:285:void checkThatInvokeCustomIsAllowed():1371:1371 -> a
-    285:285:void writeCallSite(com.android.tools.r8.graph.DexCallSite):702 -> a
+    258:258:void writeEncodedMethods(java.util.List,boolean):638 -> a
+    259:259:void writeEncodedMethods(java.util.List,boolean):641:641 -> a
+    260:260:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    260:260:void writeEncodedMethods(java.util.List,boolean):638 -> a
+    261:261:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    261:261:void writeEncodedMethods(java.util.List,boolean):631 -> a
+    262:262:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    262:262:void writeEncodedMethods(java.util.List,boolean):629 -> a
+    263:269:void addStaticFieldValues(com.android.tools.r8.graph.DexProgramClass):665:671 -> a
+    270:272:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):708:710 -> a
+    273:273:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    273:273:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):710 -> a
+    274:274:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):712:712 -> a
+    275:275:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    275:275:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):712 -> a
+    276:277:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):713:714 -> a
+    278:278:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
+    278:278:void writeEncodedArray(com.android.tools.r8.graph.DexEncodedArray):712 -> a
+    279:285:int writeMapItem(int,int,int):722:728 -> a
     286:286:void checkThatInvokeCustomIsAllowed():1370:1370 -> a
-    286:286:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):676 -> a
-    287:292:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):678:683 -> a
-    293:301:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):680:688 -> a
-    302:302:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
-    302:302:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):690 -> a
-    303:305:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):691:693 -> a
-    306:306:boolean com.android.tools.r8.graph.DexMethodHandle.isFieldHandle():293:293 -> a
-    306:306:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):693 -> a
-    307:312:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):693:698 -> a
-    313:313:void checkThatInvokeCustomIsAllowed():1371:1371 -> a
-    313:313:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):676 -> a
+    286:286:void writeCallSite(com.android.tools.r8.graph.DexCallSite):702 -> a
+    287:288:void writeCallSite(com.android.tools.r8.graph.DexCallSite):703:704 -> a
+    289:289:void checkThatInvokeCustomIsAllowed():1371:1371 -> a
+    289:289:void writeCallSite(com.android.tools.r8.graph.DexCallSite):702 -> a
+    290:290:void checkThatInvokeCustomIsAllowed():1370:1370 -> a
+    290:290:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):676 -> a
+    291:296:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):678:683 -> a
+    297:305:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):680:688 -> a
+    306:306:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
+    306:306:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):690 -> a
+    307:309:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):691:693 -> a
+    310:310:boolean com.android.tools.r8.graph.DexMethodHandle.isFieldHandle():293:293 -> a
+    310:310:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):693 -> a
+    311:316:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):693:698 -> a
+    317:317:void checkThatInvokeCustomIsAllowed():1371:1371 -> a
+    317:317:void writeMethodHandle(com.android.tools.r8.graph.DexMethodHandle):676 -> a
     1:7:void checkInterfaceMethods():237:243 -> b
     1:7:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():158 -> b
     8:8:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():161:161 -> b
@@ -13963,7 +13987,7 @@
     245:248:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):834:837 -> b
     245:248:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():224 -> b
     249:250:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():227:228 -> b
-    251:251:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> b
+    251:251:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> b
     251:251:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():228 -> b
     252:257:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():228:233 -> b
     258:258:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):828:828 -> b
@@ -14625,7 +14649,10 @@
     17:17:void parseDexFiles():53:53 -> b
     18:18:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
     18:18:void parseDexFiles():53 -> b
-    19:19:void parseDexFiles():53:53 -> b
+    19:19:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> b
+    19:19:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> b
+    19:19:void parseDexFiles():53 -> b
+    20:20:void parseDexFiles():53:53 -> b
 com.android.tools.r8.dex.VDexReader -> com.android.tools.r8.dex.J:
     boolean $assertionsDisabled -> e
     int version -> d
@@ -14651,7 +14678,10 @@
     1:13:void setByteOrder():75:87 -> g
     14:14:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> g
     14:14:void setByteOrder():87 -> g
-    15:15:void setByteOrder():87:87 -> g
+    15:15:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> g
+    15:15:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> g
+    15:15:void setByteOrder():87 -> g
+    16:16:void setByteOrder():87:87 -> g
 com.android.tools.r8.dex.VirtualFile -> com.android.tools.r8.dex.K:
     com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection indexedItems -> b
     boolean $assertionsDisabled -> f
@@ -15321,79 +15351,80 @@
     1:1:void unsetPublic():137:137 -> y
     1:1:void unsetSynthetic():195:195 -> z
 com.android.tools.r8.graph.AppInfo -> com.android.tools.r8.graph.b:
-    1:1:void <clinit>():21:21 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication):35:35 -> <init>
-    2:14:void <init>(com.android.tools.r8.graph.DexApplication):25:37 -> <init>
-    15:15:void <init>(com.android.tools.r8.graph.AppInfo):40:40 -> <init>
-    16:36:void <init>(com.android.tools.r8.graph.AppInfo):25:45 -> <init>
-    1:7:java.util.Map computeDefinitions(com.android.tools.r8.graph.DexType):93:99 -> a
-    8:8:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getKey():95:95 -> a
-    8:8:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):97 -> a
-    9:9:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):97:97 -> a
-    10:15:com.android.tools.r8.graph.ResolutionResult resolveMethodOnArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):308:313 -> a
-    16:18:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):367:369 -> a
-    19:26:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):368:375 -> a
+    1:1:void <clinit>():22:22 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication):36:36 -> <init>
+    2:14:void <init>(com.android.tools.r8.graph.DexApplication):26:38 -> <init>
+    15:15:void <init>(com.android.tools.r8.graph.AppInfo):41:41 -> <init>
+    16:36:void <init>(com.android.tools.r8.graph.AppInfo):26:46 -> <init>
+    1:1:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getKey():94:94 -> a
+    1:1:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):102 -> a
+    2:2:void lambda$computeDefinitions$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedField):102:102 -> a
+    3:9:java.util.Map computeDefinitions(com.android.tools.r8.graph.DexType):98:104 -> a
+    10:15:com.android.tools.r8.graph.ResolutionResult resolveMethodOnArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):313:318 -> a
+    16:18:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):372:374 -> a
+    19:26:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):373:380 -> a
     27:27:boolean com.android.tools.r8.graph.MethodAccessFlags.isVarargs():134:134 -> a
-    27:27:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):375 -> a
-    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():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
-    1:2:com.android.tools.r8.graph.DexApplication app():70:71 -> app
-    1:7:java.util.Map getDefinitions(com.android.tools.r8.graph.DexType):166:172 -> b
-    1:1:boolean checkIfObsolete():65:65 -> checkIfObsolete
-    1:2:java.lang.Iterable classes():103:104 -> classes
-    1:2:java.lang.Iterable classesWithDeterministicOrder():108:109 -> classesWithDeterministicOrder
-    1:1:void copyMetadataFromPrevious(com.android.tools.r8.graph.AppInfo):49:49 -> copyMetadataFromPrevious
-    1:9:com.android.tools.r8.graph.DexDefinition definitionFor(com.android.tools.r8.graph.DexReference):114:122 -> definitionFor
-    10:16:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):127:133 -> definitionFor
-    17:22:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):149:154 -> definitionFor
-    23:24:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):161:162 -> definitionFor
-    1:1:com.android.tools.r8.graph.DexProgramClass definitionForProgramType(com.android.tools.r8.graph.DexType):138:138 -> definitionForProgramType
-    1:2:com.android.tools.r8.graph.DexItemFactory dexItemFactory():76:77 -> dexItemFactory
-    1:3:com.android.tools.r8.graph.DexEncodedMethod dispatchDirectInvoke(com.android.tools.r8.graph.ResolutionResult):594:596 -> dispatchDirectInvoke
-    1:3:com.android.tools.r8.graph.DexEncodedMethod dispatchStaticInvoke(com.android.tools.r8.graph.ResolutionResult):580:582 -> dispatchStaticInvoke
-    1:2:java.util.Collection getSynthesizedClassesForSanityCheck():88:89 -> getSynthesizedClassesForSanityCheck
-    1:1:boolean hasLiveness():629:629 -> hasLiveness
-    1:1:boolean hasSubtyping():619:619 -> hasSubtyping
-    1:2:boolean isInMainDexList(com.android.tools.r8.graph.DexType):644:645 -> isInMainDexList
-    1:1:boolean isObsolete():53:53 -> isObsolete
-    1:4:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod):234:237 -> lookupDirectTarget
-    1:4:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):512:515 -> lookupInstanceTarget
-    1:4:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod):186:189 -> lookupStaticTarget
-    5:8:com.android.tools.r8.graph.DexEncodedField lookupStaticTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):525:528 -> lookupStaticTarget
-    1:20:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):203:222 -> lookupSuperTarget
-    1:5:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):247:251 -> lookupVirtualTarget
-    1:1:void markObsolete():57:57 -> markObsolete
-    1:3:com.android.tools.r8.origin.Origin originFor(com.android.tools.r8.graph.DexType):142:144 -> originFor
-    1:1:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):640:640 -> registerNewType
-    1:2:com.android.tools.r8.graph.DexEncodedField resolveField(com.android.tools.r8.graph.DexField):536:537 -> resolveField
-    1:20:com.android.tools.r8.graph.DexEncodedField resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):547:566 -> resolveFieldOn
-    1:9:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):265:273 -> resolveMethod
-    10:12:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):277:279 -> resolveMethod
-    13:16:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,boolean):294:297 -> resolveMethod
-    1:13:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):329:341 -> resolveMethodOnClass
-    14:17:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):345:348 -> resolveMethodOnClass
-    18:26:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):404:412 -> resolveMethodOnClass
-    18:26:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):353 -> resolveMethodOnClass
-    1:15:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):466:480 -> resolveMethodOnInterface
-    16:29:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):484:497 -> resolveMethodOnInterface
-    30:38:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):404:412 -> resolveMethodOnInterface
-    30:38:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):502 -> resolveMethodOnInterface
-    1:1:void unsetObsolete():61:61 -> unsetObsolete
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():634:634 -> withLiveness
-    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():624:624 -> withSubtyping
+    27:27:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):380 -> a
+    28:36:com.android.tools.r8.graph.DexEncodedMethod resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):385:393 -> 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):430:453 -> a
+    61:65:com.android.tools.r8.graph.DexEncodedMethod selectCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):613:617 -> a
+    66:66:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> a
+    66:66:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):101 -> a
+    67:67:void lambda$computeDefinitions$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexEncodedMethod):101:101 -> a
+    1:4:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):86:89 -> addSynthesizedClass
+    1:2:com.android.tools.r8.graph.DexApplication app():75:76 -> app
+    1:7:java.util.Map getDefinitions(com.android.tools.r8.graph.DexType):171:177 -> b
+    1:1:boolean checkIfObsolete():70:70 -> checkIfObsolete
+    1:2:java.lang.Iterable classes():108:109 -> classes
+    1:2:java.lang.Iterable classesWithDeterministicOrder():113:114 -> classesWithDeterministicOrder
+    1:1:void copyMetadataFromPrevious(com.android.tools.r8.graph.AppInfo):54:54 -> copyMetadataFromPrevious
+    1:9:com.android.tools.r8.graph.DexDefinition definitionFor(com.android.tools.r8.graph.DexReference):119:127 -> definitionFor
+    10:16:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):132:138 -> definitionFor
+    17:22:com.android.tools.r8.graph.DexEncodedMethod definitionFor(com.android.tools.r8.graph.DexMethod):154:159 -> definitionFor
+    23:24:com.android.tools.r8.graph.DexEncodedField definitionFor(com.android.tools.r8.graph.DexField):166:167 -> definitionFor
+    1:1:com.android.tools.r8.graph.DexProgramClass definitionForProgramType(com.android.tools.r8.graph.DexType):143:143 -> definitionForProgramType
+    1:2:com.android.tools.r8.graph.DexItemFactory dexItemFactory():81:82 -> dexItemFactory
+    1:3:com.android.tools.r8.graph.DexEncodedMethod dispatchDirectInvoke(com.android.tools.r8.graph.ResolutionResult):599:601 -> dispatchDirectInvoke
+    1:3:com.android.tools.r8.graph.DexEncodedMethod dispatchStaticInvoke(com.android.tools.r8.graph.ResolutionResult):585:587 -> dispatchStaticInvoke
+    1:2:java.util.Collection getSynthesizedClassesForSanityCheck():93:94 -> getSynthesizedClassesForSanityCheck
+    1:1:boolean hasLiveness():634:634 -> hasLiveness
+    1:1:boolean hasSubtyping():624:624 -> hasSubtyping
+    1:2:boolean isInMainDexList(com.android.tools.r8.graph.DexType):649:650 -> isInMainDexList
+    1:1:boolean isObsolete():58:58 -> isObsolete
+    1:4:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod):239:242 -> lookupDirectTarget
+    1:4:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):517:520 -> lookupInstanceTarget
+    1:4:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod):191:194 -> lookupStaticTarget
+    5:8:com.android.tools.r8.graph.DexEncodedField lookupStaticTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):530:533 -> lookupStaticTarget
+    1:20:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):208:227 -> lookupSuperTarget
+    1:5:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualTarget(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):252:256 -> lookupVirtualTarget
+    1:1:void markObsolete():62:62 -> markObsolete
+    1:1:com.android.tools.r8.utils.InternalOptions options():50:50 -> options
+    1:3:com.android.tools.r8.origin.Origin originFor(com.android.tools.r8.graph.DexType):147:149 -> originFor
+    1:1:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):645:645 -> registerNewType
+    1:2:com.android.tools.r8.graph.DexEncodedField resolveField(com.android.tools.r8.graph.DexField):541:542 -> resolveField
+    1:20:com.android.tools.r8.graph.DexEncodedField resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):552:571 -> resolveFieldOn
+    1:9:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):270:278 -> resolveMethod
+    10:12:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):282:284 -> resolveMethod
+    13:16:com.android.tools.r8.graph.ResolutionResult resolveMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,boolean):299:302 -> resolveMethod
+    1:13:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):334:346 -> resolveMethodOnClass
+    14:17:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):350:353 -> resolveMethodOnClass
+    18:26:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):409:417 -> resolveMethodOnClass
+    18:26:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):358 -> resolveMethodOnClass
+    1:15:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):471:485 -> resolveMethodOnInterface
+    16:29:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):489:502 -> resolveMethodOnInterface
+    30:38:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):409:417 -> resolveMethodOnInterface
+    30:38:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):507 -> resolveMethodOnInterface
+    1:1:void unsetObsolete():66:66 -> unsetObsolete
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():639:639 -> withLiveness
+    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():629:629 -> withSubtyping
 com.android.tools.r8.graph.AppInfo$1 -> com.android.tools.r8.graph.b$a:
 com.android.tools.r8.graph.AppInfo$MultiResultBuilder -> com.android.tools.r8.graph.b$b:
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder builder -> a
     com.android.tools.r8.graph.DexEncodedMethod singleResult -> b
-    1:1:void <init>():648:648 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppInfo$1):648:648 -> <init>
-    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
+    1:1:void <init>():653:653 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppInfo$1):653:653 -> <init>
+    1:8:void add(com.android.tools.r8.graph.DexEncodedMethod):659:666 -> a
+    9:12:com.android.tools.r8.graph.ResolutionResult build():671:674 -> a
 com.android.tools.r8.graph.AppInfoWithSubtyping -> com.android.tools.r8.graph.c:
     1:8:void <clinit>():27:34 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexApplication):133:133 -> <init>
@@ -15406,80 +15437,80 @@
     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
+    71:80:boolean isInterfaceSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):520:529 -> a
+    81:90:boolean isSubtypeOfClass(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,boolean):537:546 -> a
+    91:103:void implementedInterfaces(com.android.tools.r8.graph.DexType,java.util.Set):622:634 -> a
+    104:135:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):723:754 -> a
     1:22:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):149:170 -> addSynthesizedClass
-    1:9:java.lang.Iterable allImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType):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:9:java.lang.Iterable allImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType):561:569 -> allImmediateExtendsSubtypes
+    1:5:java.lang.Iterable allImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType):585:589 -> allImmediateImplementsSubtypes
+    1:1:java.util.Set allImmediateSubtypes(com.android.tools.r8.graph.DexType):455:455 -> allImmediateSubtypes
     1:4:void populateSuperType(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):205:208 -> b
-    5:5:boolean lambda$isStrictSubtypeOf$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):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
+    5:5:boolean lambda$isStrictSubtypeOf$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):514:514 -> b
+    6:6:boolean lambda$allImmediateExtendsSubtypes$2(com.android.tools.r8.graph.DexType):564:564 -> b
+    1:1:boolean lambda$allImmediateExtendsSubtypes$3(com.android.tools.r8.graph.DexType):567:567 -> c
+    1:49:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):660:708 -> computeLeastUpperBoundOfClasses
+    1:1:boolean lambda$allImmediateImplementsSubtypes$4(com.android.tools.r8.graph.DexType):587:587 -> d
     1:1:java.util.Set lambda$populateSuperType$0(com.android.tools.r8.graph.DexType):205:205 -> e
-    1:1:void forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):558:558 -> forAllImmediateExtendsSubtypes
-    1:1:void forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):582:582 -> forAllImmediateImplementsSubtypes
+    1:1:void forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> forAllImmediateExtendsSubtypes
+    1:1:void forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):581:581 -> forAllImmediateImplementsSubtypes
     1:2:java.util.Set getMissingClasses():191:192 -> getMissingClasses
-    1:4:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):640:643 -> getSingleSubtype
+    1:4:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):639:642 -> getSingleSubtype
     5:5:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809:809 -> getSingleSubtype
-    5:5:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):643 -> getSingleSubtype
+    5:5:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):642 -> getSingleSubtype
     6:6:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getNext(java.util.Iterator,java.lang.Object):888:888 -> getSingleSubtype
     6:6:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809 -> getSingleSubtype
-    6:6:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):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
+    6:6:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):642 -> getSingleSubtype
+    7:7:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):642:642 -> getSingleSubtype
+    1:1:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):336:336 -> hasAnyInstantiatedLambdas
+    1:1:boolean hasSubtypes(com.android.tools.r8.graph.DexType):468:468 -> hasSubtypes
+    1:1:boolean hasSubtyping():444:444 -> hasSubtyping
+    1:12:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):607:618 -> implementedInterfaces
+    13:13:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):617:617 -> implementedInterfaces
+    1:1:boolean inDifferentHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):714:714 -> inDifferentHierarchy
+    1:3:boolean isDirectSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):650:652 -> isDirectSubtype
+    1:1:boolean isExternalizable(com.android.tools.r8.graph.DexType):598:598 -> isExternalizable
+    1:1:boolean isMarkedAsInterface(com.android.tools.r8.graph.DexType):463:463 -> isMarkedAsInterface
+    1:1:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):593:593 -> isMissingOrHasMissingSuperType
     2:6:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithSubtyping):697:701 -> isMissingOrHasMissingSuperType
-    2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):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
+    2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):594 -> isMissingOrHasMissingSuperType
+    1:1:boolean isSerializable(com.android.tools.r8.graph.DexType):602:602 -> isSerializable
+    1:4:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):484:487 -> isStrictSubtypeOf
     5:7:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):175:177 -> isStrictSubtypeOf
-    5:7:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):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 isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):488 -> isStrictSubtypeOf
+    8:23:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):501:516 -> isStrictSubtypeOf
+    1:4:boolean isStringConcat(com.android.tools.r8.graph.DexMethodHandle):429:432 -> isStringConcat
+    1:4:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):473:476 -> isSubtype
     5:7:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):175:177 -> isSubtype
-    5:7:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):478 -> isSubtype
-    1:1:boolean isUnknown(com.android.tools.r8.graph.DexType):460:460 -> isUnknown
+    5:7:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):477 -> isSubtype
+    1:1:boolean isUnknown(com.android.tools.r8.graph.DexType):459:459 -> isUnknown
     2:2:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():102:102 -> isUnknown
-    2:2:boolean isUnknown(com.android.tools.r8.graph.DexType):460 -> isUnknown
+    2:2:boolean isUnknown(com.android.tools.r8.graph.DexType):459 -> isUnknown
     1:1:java.lang.Iterable libraryClasses():186:186 -> libraryClasses
     2:2:com.android.tools.r8.graph.DirectMappedDexApplication getDirectApplication():182:182 -> libraryClasses
     2:2:java.lang.Iterable libraryClasses():187 -> libraryClasses
     3:3:java.lang.Iterable libraryClasses():187:187 -> libraryClasses
-    1:11:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):389:399 -> lookupLambdaImplementedMethods
+    1:11:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):388:398 -> lookupLambdaImplementedMethods
     12:12:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():102:102 -> lookupLambdaImplementedMethods
-    12:12:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):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):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):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
+    12:12:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):398 -> lookupLambdaImplementedMethods
+    13:26:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):409:422 -> lookupLambdaImplementedMethods
+    27:27:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):391:391 -> lookupLambdaImplementedMethods
+    1:5:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):325:329 -> lookupSuperTarget
+    6:6:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> lookupSuperTarget
+    6:6:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):330 -> lookupSuperTarget
+    7:7:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):330:330 -> lookupSuperTarget
+    8:8:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> lookupSuperTarget
+    8:8:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):330 -> lookupSuperTarget
+    9:11:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):330:332 -> lookupSuperTarget
+    1:1:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):718:718 -> mayHaveFinalizeMethodDirectlyOrIndirectly
+    1:7:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):354:360 -> methodDefinedInInterface
     8:8:boolean com.android.tools.r8.graph.DexMethod.hasSameProtoAndName(com.android.tools.r8.graph.DexMethod):103:103 -> methodDefinedInInterface
-    8:8:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):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
+    8:8:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):360 -> methodDefinedInInterface
+    9:15:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):360:366 -> methodDefinedInInterface
+    1:6:boolean methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):341:346 -> methodDefinedInInterfaces
+    1:3:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):437:439 -> registerNewType
     1:4:java.util.Set subtypes(com.android.tools.r8.graph.DexType):196:199 -> subtypes
-    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():451:451 -> withSubtyping
+    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():450:450 -> withSubtyping
 com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo -> com.android.tools.r8.graph.c$a:
     java.util.Set directSubtypes -> c
     java.util.Set implementedInterfaces -> d
@@ -15651,7 +15682,7 @@
     8:19:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):101:112 -> a
     20:21:void writeIR(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):121:122 -> a
     20:21:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):113 -> a
-    22:22:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):363:363 -> a
+    22:22:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):358:358 -> a
     22:22:void writeIR(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):122 -> a
     22:22:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):113 -> a
     23:24:void writeIR(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):123:124 -> a
@@ -15694,10 +15725,10 @@
     13:13:void com.android.tools.r8.cf.code.CfLabel.write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):47:47 -> a
     13:13:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):200 -> a
     14:15:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):202:203 -> a
-    16:16:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
-    16:16:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():313 -> a
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():315 -> a
     16:16:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):205 -> a
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():314:314 -> a
+    17:17:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():316:316 -> a
     17:17:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):205 -> a
     18:34:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):208:224 -> a
     35:48:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):218:231 -> a
@@ -15717,11 +15748,11 @@
     93:104:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):486:497 -> a
     105:105:boolean com.android.tools.r8.graph.MethodAccessFlags.isSynchronized():110:110 -> a
     105:105:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):497 -> a
-    106:106:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():212:212 -> a
+    106:106:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():211:211 -> a
     106:106:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):498 -> a
     107:116:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):499:508 -> a
     117:125:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):506:514 -> a
-    126:126:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():220:220 -> a
+    126:126:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():219:219 -> a
     126:126:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):517 -> a
     127:127:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexType):517:517 -> a
     1:1:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):281:281 -> buildIR
@@ -16779,58 +16810,59 @@
     com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo optimizationInfo -> e
     com.android.tools.r8.graph.FieldAccessFlags accessFlags -> b
     com.android.tools.r8.graph.DexValue staticValue -> d
-    1:2:void <clinit>():16:17 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):30:30 -> <init>
-    2:12:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):24:34 -> <init>
-    1:3:boolean isProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):38:40 -> a
-    4:4:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):60:60 -> a
-    5:5:boolean isStatic():115:115 -> a
-    5:5:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):156 -> a
-    6:6:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):157:157 -> a
+    1:2:void <clinit>():15:16 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):29:29 -> <init>
+    2:12:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):23:33 -> <init>
+    1:3:boolean isProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):37:39 -> a
+    4:4:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):59:59 -> a
+    5:5:boolean isStatic():114:114 -> a
+    5:5:boolean mayTriggerClassInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):179 -> a
+    6:6:boolean mayTriggerClassInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):182:182 -> 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.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):157 -> a
-    8:18:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):161:171 -> a
-    19:27:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):170:178 -> a
-    28:28:boolean isStatic():115:115 -> a
-    28:28:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):181 -> a
-    29:35:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):181:187 -> a
-    36:36:boolean isStatic():115:115 -> a
-    36:36:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):187 -> a
-    37:37:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):188:188 -> a
-    38:38:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    38:38:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):188 -> a
-    39:43:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):189:193 -> a
-    44:44:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):147:147 -> a
-    44:44:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):193 -> a
-    45:45:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):194:194 -> a
-    46:46:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):147:147 -> a
-    46:46:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):193 -> a
-    47:49:void setStaticValue(com.android.tools.r8.graph.DexValue):137:139 -> a
-    50:50:boolean lambda$valueAsConstInstruction$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):166:166 -> a
-    51:51:java.lang.Boolean lambda$valueAsConstInstruction$1(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):171:171 -> a
-    52:59:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):202:209 -> a
-    1:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):66:67 -> collectIndexedItems
+    7:7:boolean mayTriggerClassInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):182 -> a
+    8:17:boolean mayTriggerClassInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):186:195 -> a
+    18:18:boolean mayTriggerClassInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):194:194 -> a
+    19:21:void setStaticValue(com.android.tools.r8.graph.DexValue):136:138 -> a
+    22:22:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):153:153 -> a
+    23:23:boolean isStatic():114:114 -> a
+    23:23:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):156 -> a
+    24:30:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):156:162 -> a
+    31:31:boolean isStatic():114:114 -> a
+    31:31:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):162 -> a
+    32:32:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):163:163 -> 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:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):163 -> a
+    34:38:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):164:168 -> a
+    39:39:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):150:150 -> a
+    39:39:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):168 -> a
+    40:40:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):169:169 -> a
+    41:41:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):150:150 -> a
+    41:41:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):168 -> a
+    42:42:boolean lambda$mayTriggerClassInitializationSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):190:190 -> a
+    43:43:java.lang.Boolean lambda$mayTriggerClassInitializationSideEffects$1(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):195:195 -> a
+    44:51:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):202:209 -> a
+    1:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):65:66 -> collectIndexedItems
     3:3:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):66:66 -> collectIndexedItems
-    3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):67 -> collectIndexedItems
-    4:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):68:69 -> collectIndexedItems
-    1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):75:75 -> collectMixedSectionItems
+    3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):66 -> collectIndexedItems
+    4:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):67:68 -> collectIndexedItems
+    1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):74:74 -> collectMixedSectionItems
     com.android.tools.r8.graph.DexEncodedField asDexEncodedField() -> g
     boolean isDexEncodedField() -> j
-    1:1:boolean isStatic():115:115 -> l
-    1:1:boolean isStaticMember():124 -> l
-    1:1:com.android.tools.r8.graph.DexReference toReference():100:100 -> m
-    1:1:com.android.tools.r8.graph.DexField getKey():95:95 -> n
-    2:2:com.android.tools.r8.graph.DexField getKey():95:95 -> n
-    2:2:com.android.tools.r8.graph.PresortedComparable getKey():16 -> n
-    1:7:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():50:56 -> o
-    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():46:46 -> p
-    1:2:com.android.tools.r8.graph.DexValue getStaticValue():143:144 -> q
-    1:1:boolean hasAnnotation():128:128 -> r
-    1:2:boolean hasExplicitStaticValue():132:133 -> s
-    1:1:boolean isStatic():115:115 -> t
-    1:1:java.lang.String toSmaliString():85:85 -> toSmaliString
-    1:1:java.lang.String toSourceString():90:90 -> toSourceString
-    1:1:java.lang.String toString():80:80 -> toString
+    1:1:boolean isStatic():114:114 -> l
+    1:1:boolean isStaticMember():123 -> l
+    1:1:com.android.tools.r8.graph.DexReference toReference():99:99 -> m
+    1:1:com.android.tools.r8.graph.DexField getKey():94:94 -> n
+    2:2:com.android.tools.r8.graph.DexField getKey():94:94 -> n
+    2:2:com.android.tools.r8.graph.PresortedComparable getKey():15 -> n
+    1:7:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():49:55 -> o
+    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():45:45 -> p
+    1:2:com.android.tools.r8.graph.DexValue getStaticValue():142:143 -> q
+    1:1:boolean hasAnnotation():127:127 -> r
+    1:2:boolean hasExplicitStaticValue():131:132 -> s
+    1:1:boolean isStatic():114:114 -> t
+    1:1:java.lang.String toSmaliString():84:84 -> toSmaliString
+    1:1:java.lang.String toSourceString():89:89 -> toSourceString
+    1:1:java.lang.String toString():79:79 -> toString
 com.android.tools.r8.graph.DexEncodedMethod -> com.android.tools.r8.graph.S:
     com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo callSiteOptimizationInfo -> h
     boolean obsolete -> m
@@ -16854,10 +16886,10 @@
     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 hasAnnotation():1080:1081 -> A
+    1:2:boolean hasClassFileVersion():565:566 -> B
+    1:1:boolean hasCode():545:545 -> C
+    1:1:boolean hasParameterInfo():500:500 -> 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():272 -> E
@@ -16890,223 +16922,219 @@
     1:2:boolean isVirtualMethod():285:286 -> V
     3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> V
     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:2:void markNotProcessed():451:452 -> W
+    1:2:java.lang.String qualifiedName():577:578 -> X
+    1:2:void removeCode():554:555 -> 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):1316 -> a
-    7:7:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1317:1317 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1050 -> a
+    6:6:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1317 -> a
+    7:7:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1318:1318 -> a
     8:8:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> a
-    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
+    8:8:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1318 -> a
+    9:9:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1319:1319 -> 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
+    12:67: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:420 -> a
+    68: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):405:408 -> 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):398:401 -> 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):391:394 -> a
+    80:112: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):384:416 -> a
+    113:132:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):425:444 -> a
+    133:133:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):441:441 -> a
+    134:134:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):438:438 -> a
+    135:135:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):435:435 -> a
+    136:136:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):432:432 -> a
+    137:155:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):429:447 -> a
+    156:157:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):456:457 -> a
+    158: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):466:467 -> a
+    160:163:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):472:475 -> a
+    164:164:boolean hasParameterInfo():500:500 -> a
+    164:164:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):475 -> a
+    165:166:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):475:476 -> a
+    167:168:void setParameterInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):495:496 -> a
+    167:168:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):476 -> a
+    169:169:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):478:478 -> a
+    170:172:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.graph.AppView):482:484 -> a
+    173:178:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):532:537 -> a
+    179:187:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):587:595 -> a
+    188:200:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):599:611 -> a
+    201:258:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):332:389 -> a
+    201:258:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612 -> a
+    259:262:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):612:615 -> a
+    263:272:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):642:651 -> a
+    273:274:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):706:707 -> a
+    275:279:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):726:730 -> a
+    275:279:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    280:287:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):729:736 -> a
+    280:287:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    288:294:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):735:741 -> a
+    288:294:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    295:310:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):739:754 -> a
+    295:310:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    311:311:void setObsolete():166:166 -> a
+    311:311:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):755 -> a
+    311:311:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    312:312:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):756:756 -> a
+    312:312:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
+    313:313:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709:709 -> a
+    314:318:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):760:764 -> a
+    314:318:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    319:327:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):763:771 -> a
+    319:327:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    328:336:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):768:776 -> a
+    328:336:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    337:345:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):773:781 -> a
+    337:345:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    346:350:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):779:783 -> a
+    346:350:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    351:352:boolean isStaticMember():334:335 -> a
+    351:352:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):784 -> a
+    351:352:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    353:375:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):788:810 -> a
+    353:375:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    376:376:void setObsolete():166:166 -> a
+    376:376:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):811 -> a
+    376:376:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    377:377:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):812:812 -> a
+    377:377:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
+    378:382:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):714:718 -> a
+    383:387:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):717:721 -> a
+    388:388:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
+    388:388:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):721 -> a
+    389:389:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):721:721 -> a
+    390:391:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):816:817 -> a
+    392:406:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):821:835 -> a
+    407:425:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):851:869 -> a
+    426:426:void com.android.tools.r8.graph.AccessFlags.unsetPrivate():150:150 -> a
+    426:426:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):869 -> a
+    427:427:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):870:870 -> a
+    428:428:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
+    428:428:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):870 -> a
+    429:429:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):871:871 -> a
+    430:430:void com.android.tools.r8.graph.MethodAccessFlags.setConstructor():174:174 -> a
+    430:430:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):871 -> a
+    431:431:com.android.tools.r8.graph.DexEncodedMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):872:872 -> a
+    432:437: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):877:882 -> a
+    438:461: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):879:902 -> a
+    462:462: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):887:887 -> a
+    463:466:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):890:893 -> a
+    467:467:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstance():466:466 -> a
+    467:467:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():482 -> a
+    467:467:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):894 -> a
+    468:468:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():482:482 -> a
+    468:468:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):894 -> a
+    469:471:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):895:897 -> a
+    472:472:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():474:474 -> a
+    472:472:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):897 -> a
+    473:474:void lambda$createFieldAccessorBridge$2(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):897:898 -> a
+    475:477:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):906:908 -> a
+    478:481: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):917:920 -> a
+    482:482:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
+    482:482: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):920 -> a
+    483: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):921:922 -> a
+    485:485:void com.android.tools.r8.graph.AccessFlags.unsetPrivate():150:150 -> a
+    485:485: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 -> a
+    486:490: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):923:927 -> a
+    491:495: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):924:928 -> a
+    496:501:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):963:968 -> a
+    502:502:void com.android.tools.r8.graph.AccessFlags.demote(int):246:246 -> a
+    502:502:void com.android.tools.r8.graph.AccessFlags.demoteFromFinal():203 -> a
+    502:502:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):968 -> a
+    503:510:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):970:977 -> a
+    511:511:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():154:154 -> a
+    511:511:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):977 -> a
+    512:531:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):980:999 -> a
+    532:532:void com.android.tools.r8.graph.MethodAccessFlags.setBridge():126:126 -> a
+    532:532:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):999 -> a
+    533:533:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1001:1001 -> a
+    534:534:void com.android.tools.r8.graph.AccessFlags.setSynthetic():191:191 -> a
+    534:534:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1001 -> a
+    535:535:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1004:1004 -> a
+    536:547:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1024:1035 -> a
+    548:558:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1034:1044 -> a
+    559:562:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1085:1088 -> a
+    563:563:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    563:563:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1088 -> a
+    564:564:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):1090:1090 -> a
+    565:566:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):1166:1167 -> a
+    567:567:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1189:1189 -> a
+    568:569:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1153:1154 -> a
+    568:569:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1191 -> a
+    570:574:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1191:1195 -> a
+    575:575:boolean hasSingleTarget():1341:1341 -> a
+    576:577:void forEachTarget(java.util.function.Consumer):1353:1354 -> 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):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
+    9:12:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):488:491 -> b
+    13:14:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1153:1154 -> b
+    13:14:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):491 -> b
+    15:15:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):491:491 -> b
+    16:37:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):932:953 -> 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):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
+    38:38:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):953 -> b
+    39:40:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):954:955 -> 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):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
+    41:41:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):955 -> b
+    42:45:com.android.tools.r8.graph.DexEncodedMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):956:959 -> b
+    46:49:void lambda$toForwardingMethod$4(com.android.tools.r8.graph.UseRegistry):993:996 -> b
+    50:50:com.android.tools.r8.graph.DexEncodedMethod asSingleTarget():1335:1335 -> b
+    1:1:boolean shouldNotHaveCode():541:541 -> 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
+    2:5:void upgradeClassFileVersion(int):570:573 -> c
+    6:6:void lambda$toInitializerForwardingBridge$0(com.android.tools.r8.graph.UseRegistry):866:866 -> c
+    7:7:com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve():1329:1329 -> c
+    1:7:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():625:631 -> c0
     8:8:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():154:154 -> c0
-    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
+    8:8:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():631 -> c0
+    9:9:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():632:632 -> c0
+    1:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):516:522 -> collectIndexedItems
+    1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):527:527 -> 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
+    2:5:void lambda$toStaticForwardingBridge$3(com.android.tools.r8.graph.UseRegistry):947:950 -> d
+    6:6:boolean isValidVirtualTargetForDynamicDispatch():1324:1324 -> d
+    1:7:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():696:702 -> 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
+    2:3:java.util.List asListOfTargets():1347:1348 -> e
+    1:10:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex():672:681 -> 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:9:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1008:1016 -> f0
+    10:10:void setObsolete():166:166 -> f0
+    10:10:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1017 -> f0
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1200:1200 -> g
     1:1:void unsetObsolete():193:193 -> g0
-    1:1:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():1077:1077 -> h
+    1:1:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():1075:1075 -> h
     1:1:void checkIfObsolete():154:154 -> h0
-    1:1:boolean isDexEncodedMethod():1071:1071 -> k
+    1:1:boolean isDexEncodedMethod():1069:1069 -> 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
+    1:2:com.android.tools.r8.graph.DexReference toReference():1063:1064 -> m
+    1:1:com.android.tools.r8.graph.DexMethod getKey():1058:1058 -> n
+    2:2:com.android.tools.r8.graph.DexMethod getKey():1058:1058 -> 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:8:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():685:692 -> o
+    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():661:662 -> p
+    1:2:java.lang.String codeToString():1050:1051 -> q
+    1:2:java.lang.String descriptor():582:583 -> r
+    1:2:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getCallSiteOptimizationInfo():1171:1172 -> s
+    1:3:int getClassFileVersion():559:561 -> t
+    1:2:java.lang.String toSourceString():620:621 -> toSourceString
+    1:2:java.lang.String toString():509:510 -> toString
+    1:2:com.android.tools.r8.graph.Code getCode():549:550 -> 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
+    1:9:com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo getMutableCallSiteOptimizationInfo(com.android.tools.r8.graph.AppView):1177:1185 -> w
+    1:5:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMutableOptimizationInfo():1158:1162 -> x
+    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1153:1154 -> y
+    1:1:java.util.Map getParameterInfo():504:504 -> z
 com.android.tools.r8.graph.DexEncodedMethod$1 -> com.android.tools.r8.graph.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>():429:429 -> <clinit>
-    2:2:void <clinit>():384:384 -> <clinit>
+    1:1:void <clinit>():427:427 -> <clinit>
+    2:2:void <clinit>():379:379 -> <clinit>
 com.android.tools.r8.graph.DexEncodedMethod$Builder -> com.android.tools.r8.graph.S$b:
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState compilationState -> f
     com.android.tools.r8.graph.DexAnnotationSet annotations -> c
@@ -17117,29 +17145,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>():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():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
+    1:1:void <clinit>():1203:1203 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$1):1203:1203 -> <init>
+    2:18:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1214:1230 -> <init>
+    19:19:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1226:1226 -> <init>
+    1:1:com.android.tools.r8.graph.MethodAccessFlags access$000(com.android.tools.r8.graph.DexEncodedMethod$Builder):1203:1203 -> a
+    2:2:void setMethod(com.android.tools.r8.graph.DexMethod):1235:1235 -> a
+    3:22:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1244:1263 -> a
+    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1239:1239 -> a
+    23:23:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1263 -> a
+    24:26:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1266:1268 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1239:1239 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1266 -> a
+    28:30:com.android.tools.r8.graph.DexEncodedMethod$Builder adjustOptimizationInfoAfterRemovingThisParameter():1288:1290 -> a
+    31:31:void setCode(com.android.tools.r8.graph.Code):1296:1296 -> a
+    1:6:com.android.tools.r8.graph.DexEncodedMethod build():1300:1305 -> b
+    7:13:com.android.tools.r8.graph.DexEncodedMethod build():1304:1310 -> b
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1273:1273 -> c
+    2:2:void com.android.tools.r8.graph.AccessFlags.promoteToStatic():216:216 -> c
+    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1273 -> c
+    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1278:1282 -> d
 com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility -> com.android.tools.r8.graph.S$c:
     boolean returnsReceiver -> a
-    1:2:void <init>(boolean):1104:1105 -> <init>
+    1:2:void <init>(boolean):1102:1103 -> <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
@@ -17154,20 +17182,20 @@
     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):1109:1109 -> <init>
-    2:2:void <init>():1111:1111 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):1107:1107 -> <init>
+    2:2:void <init>():1109:1109 -> <init>
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer asTrivialClassInitializer() -> a
     boolean isTrivialInstanceInitializer() -> b
 com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer -> com.android.tools.r8.graph.S$e$a:
     com.android.tools.r8.graph.DexField field -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexField):1143:1144 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.DexField):1141:1142 -> <init>
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer asTrivialClassInitializer() -> a
-com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer -> com.android.tools.r8.graph.S$e$b:
+com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer -> com.android.tools.r8.graph.T:
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer INSTANCE -> a
-    1:1:void <clinit>():1126:1126 -> <clinit>
-    1:1:void <init>():1129:1129 -> <init>
+    1:1:void <clinit>():1124:1124 -> <clinit>
+    1:1:void <init>():1127:1127 -> <init>
     boolean isTrivialInstanceInitializer() -> b
-com.android.tools.r8.graph.DexField -> com.android.tools.r8.graph.T:
+com.android.tools.r8.graph.DexField -> com.android.tools.r8.graph.U:
     com.android.tools.r8.graph.DexString name -> e
     com.android.tools.r8.graph.DexType type -> d
     com.android.tools.r8.graph.DexType holder -> c
@@ -17206,7 +17234,7 @@
     1:1:java.lang.String toSmaliString():136:136 -> toSmaliString
     1:1:java.lang.String toSourceString():141:141 -> toSourceString
     1:1:java.lang.String toString():47:47 -> toString
-com.android.tools.r8.graph.DexItem -> com.android.tools.r8.graph.U:
+com.android.tools.r8.graph.DexItem -> com.android.tools.r8.graph.V:
     1:1:void <init>():12:12 -> <init>
     1:1:void collectAll(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexItem[]):15:15 -> a
     2:2:void lambda$collectAll$0(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexItem):15:15 -> a
@@ -17220,383 +17248,384 @@
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod):50:50 -> collectIndexedItems
     1:1:java.lang.String toSmaliString():60:60 -> toSmaliString
     1:1:java.lang.String toSourceString():64:64 -> toSourceString
-com.android.tools.r8.graph.DexItemFactory -> com.android.tools.r8.graph.V:
-    com.android.tools.r8.graph.DexString getMethodName -> A0
+com.android.tools.r8.graph.DexItemFactory -> com.android.tools.r8.graph.W:
+    com.android.tools.r8.graph.DexString getDeclaredFieldName -> A0
     com.android.tools.r8.graph.DexString unboxLongMethodName -> Q
-    com.android.tools.r8.graph.DexString strictMathDescriptor -> b1
-    com.android.tools.r8.graph.DexType proxyType -> F2
+    com.android.tools.r8.graph.DexString mathDescriptor -> b1
+    com.android.tools.r8.graph.DexType invocationHandlerType -> F2
     com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd setPrologueEnd -> m
+    com.android.tools.r8.kotlin.Kotlin kotlin -> r3
     java.util.concurrent.ConcurrentHashMap classTypeLatticeInterfaces -> q
-    com.android.tools.r8.graph.DexString charSequenceDescriptor -> I0
-    com.android.tools.r8.graph.DexString serviceLoaderDescriptor -> j1
-    com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> r0
+    com.android.tools.r8.graph.DexString assertionErrorDescriptor -> I0
+    com.android.tools.r8.graph.DexString proxyDescriptor -> j1
+    com.android.tools.r8.graph.DexString nameMethodName -> r0
     com.android.tools.r8.graph.DexString shortDescriptor -> A
-    com.android.tools.r8.graph.DexType longType -> V1
-    com.android.tools.r8.graph.DexType classType -> w2
+    com.android.tools.r8.graph.DexType intType -> V1
+    com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> w2
     java.util.concurrent.ConcurrentHashMap strings -> a
-    com.android.tools.r8.graph.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.DexMethod metafactoryAltMethod -> Z3
+    com.android.tools.r8.graph.DexString getFieldName -> z0
+    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> g4
+    com.android.tools.r8.graph.DexType callSiteType -> O3
+    com.android.tools.r8.graph.DexType classArrayType -> o2
     com.android.tools.r8.graph.DexString contentEqualsMethodName -> a0
-    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> G3
+    com.android.tools.r8.graph.DexType annotationThrows -> G3
     com.android.tools.r8.graph.DexString unboxFloatMethodName -> R
-    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 autoCloseableDescriptor -> Q0
-    com.android.tools.r8.graph.DexString callableDescriptor -> r1
+    com.android.tools.r8.graph.DexType boxedShortType -> g2
+    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> p3
+    com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> I1
+    com.android.tools.r8.graph.DexString valueOfMethodName -> i0
+    com.android.tools.r8.graph.DexString classLoaderDescriptor -> Q0
+    com.android.tools.r8.graph.DexString comparatorDescriptor -> r1
     com.android.tools.r8.graph.DexString voidDescriptor -> B
-    com.android.tools.r8.graph.DexType icceType -> W2
-    com.android.tools.r8.graph.DexType annotationDefault -> x3
+    com.android.tools.r8.graph.DexType illegalAccessErrorType -> W2
     java.util.concurrent.ConcurrentHashMap referenceTypeLatticeElements -> p
-    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 objectsDescriptor -> Y0
+    com.android.tools.r8.graph.DexString illegalAccessErrorDescriptor -> z1
+    com.android.tools.r8.graph.DexType comparatorType -> O2
+    com.android.tools.r8.graph.DexMethod stringConcatWithConstantsMethod -> b4
+    java.util.IdentityHashMap internalSentinels -> m4
+    com.android.tools.r8.graph.DexString icceDescriptor -> A1
     com.android.tools.r8.graph.DexString unboxDoubleMethodName -> S
     com.android.tools.r8.graph.DexString booleanDescriptor -> t
-    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 invocationHandlerDescriptor -> i1
+    com.android.tools.r8.graph.DexType methodTypeType -> E2
+    com.android.tools.r8.graph.DexString runtimeExceptionDescriptor -> H0
+    com.android.tools.r8.graph.DexString classDescriptor -> P0
+    com.android.tools.r8.graph.DexString collectionDescriptor -> q1
+    com.android.tools.r8.graph.DexString ordinalMethodName -> q0
+    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> j3
+    com.android.tools.r8.graph.DexType floatType -> U1
+    com.android.tools.r8.graph.DexType strictMathType -> v2
     com.android.tools.r8.graph.DexString boxedBooleanDescriptor -> C
-    com.android.tools.r8.graph.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.DexMethod metafactoryMethod -> Y3
+    com.android.tools.r8.graph.DexType comparableType -> V3
+    com.android.tools.r8.graph.DexString getDeclaredConstructorName -> y0
+    com.android.tools.r8.graph.DexType objectArrayType -> n2
+    com.android.tools.r8.graph.DexType metafactoryType -> N3
+    com.android.tools.r8.graph.DexString iterableDescriptor -> a1
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> d3
+    com.android.tools.r8.graph.DexType boxedLongType -> f2
     com.android.tools.r8.graph.DexString isEmptyMethodName -> T
     com.android.tools.r8.graph.DexString byteDescriptor -> u
-    com.android.tools.r8.graph.DexString valueOfMethodName -> h0
-    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 trimName -> h0
+    com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> H1
+    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> F3
+    com.android.tools.r8.graph.DexString finalizeMethodName -> p0
+    com.android.tools.r8.graph.DexString throwableArrayDescriptor -> P1
+    com.android.tools.r8.graph.DexType throwableType -> V2
     com.android.tools.r8.graph.DexString boxedByteDescriptor -> D
-    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
+    com.android.tools.r8.graph.DexString annotationDescriptor -> X0
+    com.android.tools.r8.graph.DexString throwableDescriptor -> y1
+    com.android.tools.r8.graph.DexType collectionType -> N2
+    com.android.tools.r8.graph.DexString getDeclaredMethodName -> C0
+    com.android.tools.r8.graph.DexString stringBuilderDescriptor -> d1
     java.util.Map setInlineFrames -> o
-    com.android.tools.r8.graph.DexType methodTypeType -> D2
+    com.android.tools.r8.graph.DexType methodHandleType -> D2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap defaults -> i
-    com.android.tools.r8.graph.DexString stringDescriptor -> K0
-    com.android.tools.r8.graph.DexString listDescriptor -> l1
+    com.android.tools.r8.graph.DexString charSequenceArrayDescriptor -> K0
+    com.android.tools.r8.graph.DexString serviceLoaderConfigurationErrorDescriptor -> l1
     com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin setEpilogueBegin -> l
-    com.android.tools.r8.graph.DexString getNameName -> t0
+    com.android.tools.r8.graph.DexString forNameMethodName -> t0
     java.util.concurrent.ConcurrentHashMap methods -> e
-    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.DexType externalizableType -> U3
+    com.android.tools.r8.graph.DexType doubleType -> T1
+    com.android.tools.r8.graph.DexType mathType -> u2
+    java.util.Set libraryClassesWithoutStaticInitialization -> i4
+    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> M3
     com.android.tools.r8.graph.DexString unboxByteMethodName -> M
-    com.android.tools.r8.graph.DexType 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.DexType objectType -> m2
+    com.android.tools.r8.graph.DexString noClassDefFoundErrorDescriptor -> C1
     com.android.tools.r8.graph.DexString lastIndexOfMethodName -> c0
-    com.android.tools.r8.graph.DexType boxedLongType -> e2
+    com.android.tools.r8.graph.DexType boxedIntType -> e2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap advancePCs -> h
-    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> E3
-    com.android.tools.r8.graph.DexString classConstructorMethodName -> K1
-    com.android.tools.r8.graph.DexString convertMethodName -> k0
-    com.android.tools.r8.graph.DexString constructorDescriptor -> S0
-    com.android.tools.r8.graph.DexString consumerDescriptor -> t1
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> e3
+    com.android.tools.r8.graph.DexType annotationSignature -> E3
+    com.android.tools.r8.graph.DexString constructorMethodName -> K1
+    com.android.tools.r8.graph.DexString internMethodName -> k0
+    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> u3
+    com.android.tools.r8.graph.DexString classArrayDescriptor -> S0
+    com.android.tools.r8.graph.DexString supplierDescriptor -> t1
     java.util.concurrent.ConcurrentHashMap protos -> d
-    com.android.tools.r8.graph.DexType throwableType -> U2
-    com.android.tools.r8.graph.DexType collectionType -> M2
+    com.android.tools.r8.graph.DexType runtimeExceptionType -> U2
+    com.android.tools.r8.graph.DexType mapEntryType -> M2
     com.android.tools.r8.graph.DexString unboxCharMethodName -> N
-    com.android.tools.r8.graph.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
+    boolean $assertionsDisabled -> n4
+    com.android.tools.r8.graph.DexString strictMathDescriptor -> c1
+    com.android.tools.r8.graph.DexString getMethodName -> B0
+    com.android.tools.r8.graph.DexType varHandleType -> C2
+    com.android.tools.r8.graph.DexString serviceLoaderDescriptor -> k1
+    com.android.tools.r8.graph.DexString charSequenceDescriptor -> J0
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap restartLocals -> k
-    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
+    com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> s0
+    com.android.tools.r8.graph.DexType charType -> S1
+    com.android.tools.r8.graph.DexType iterableType -> t2
     java.util.concurrent.ConcurrentHashMap fields -> c
-    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> r3
-    com.android.tools.r8.graph.DexType externalizableType -> T3
-    java.util.Set libraryClassesWithoutStaticInitialization -> h4
-    com.android.tools.r8.graph.DexType objectType -> l2
+    com.android.tools.r8.graph.DexType serializableType -> T3
+    java.util.Set libraryTypesAssumedToBePresent -> h4
+    com.android.tools.r8.graph.DexType stringArrayType -> l2
+    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods utilArraysMethods -> i3
     com.android.tools.r8.graph.DexString unboxShortMethodName -> O
-    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> L3
+    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> L3
     com.android.tools.r8.graph.DexString unboxIntMethodName -> P
     com.android.tools.r8.graph.DexString indexOfMethodName -> b0
-    com.android.tools.r8.graph.DexString 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.graph.DexString exceptionInInitializerErrorDescriptor -> B1
+    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> X3
+    com.android.tools.r8.graph.DexType boxedFloatType -> d2
+    com.android.tools.r8.graph.DexType annotationMethodParameters -> D3
+    com.android.tools.r8.graph.DexString unknownTypeName -> l4
+    com.android.tools.r8.graph.DexString toStringMethodName -> j0
+    com.android.tools.r8.graph.DexString newUpdaterName -> J1
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap endLocals -> j
-    com.android.tools.r8.graph.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
+    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> q3
+    com.android.tools.r8.graph.DexString autoCloseableDescriptor -> R0
+    com.android.tools.r8.graph.DexString callableDescriptor -> s1
+    com.android.tools.r8.graph.DexType optionalType -> T2
     java.util.concurrent.ConcurrentHashMap types -> b
-    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 collectionsDescriptor -> Z0
+    com.android.tools.r8.graph.DexItemFactory$EnumMethods enumMethods -> n3
+    com.android.tools.r8.graph.DexType mapType -> L2
+    com.android.tools.r8.graph.DexMethod stringConcatMethod -> c4
+    com.android.tools.r8.graph.DexString assertionsDisabled -> E0
+    com.android.tools.r8.graph.DexString varHandleDescriptor -> f1
+    com.android.tools.r8.graph.DexType stringBufferType -> B2
+    com.android.tools.r8.graph.DexType reflectiveOperationExceptionType -> c3
     com.android.tools.r8.graph.DexString equalsMethodName -> Y
     com.android.tools.r8.graph.DexString longDescriptor -> z
-    com.android.tools.r8.graph.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.DexItemFactory$ConstructorMethods constructorMethods -> m3
+    com.android.tools.r8.graph.DexString stringArrayDescriptor -> M0
+    com.android.tools.r8.graph.DexString setDescriptor -> n1
+    com.android.tools.r8.graph.DexType boxedBooleanType -> Z1
+    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> t3
+    com.android.tools.r8.graph.DexString getCanonicalNameName -> v0
+    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> s3
+    com.android.tools.r8.graph.DexType enumerationType -> S3
+    com.android.tools.r8.graph.DexType byteType -> R1
+    com.android.tools.r8.graph.DexType collectionsType -> s2
     com.android.tools.r8.graph.DexString boxedLongDescriptor -> I
-    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.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> k3
+    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> K3
+    com.android.tools.r8.graph.DexType stringType -> k2
+    com.android.tools.r8.graph.DexString npeDescriptor -> E1
     com.android.tools.r8.utils.LRUCacheTable leastUpperBoundOfInterfacesTable -> r
     com.android.tools.r8.graph.DexString compareToIgnoreCaseMethodName -> e0
-    com.android.tools.r8.graph.DexType annotationMethodParameters -> C3
-    com.android.tools.r8.graph.DexType boxedFloatType -> c2
+    com.android.tools.r8.graph.DexType annotationMemberClasses -> C3
+    com.android.tools.r8.graph.DexType boxedDoubleType -> c2
     com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> Z
-    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 thisName -> M1
+    com.android.tools.r8.graph.DexString wrapperFieldName -> m0
+    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> w3
+    com.android.tools.r8.graph.DexString fieldDescriptor -> U0
+    com.android.tools.r8.graph.DexString runnableDescriptor -> v1
+    com.android.tools.r8.graph.DexType runnableType -> S2
     com.android.tools.r8.graph.DexString boxedShortDescriptor -> J
-    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.graph.DexProto deserializeLambdaMethodProto -> x3
+    com.android.tools.r8.graph.DexType setType -> K2
+    com.android.tools.r8.graph.DexString stringBufferDescriptor -> e1
+    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> I2
+    com.android.tools.r8.graph.DexString newInstanceName -> D0
+    java.util.Map libraryMethodsWithoutSideEffects -> f4
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap advanceLines -> g
-    com.android.tools.r8.graph.DexType 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.DexItemFactory$NullPointerExceptionMethods npeMethods -> o3
+    com.android.tools.r8.graph.DexType npeType -> b3
+    com.android.tools.r8.graph.DexString stringDescriptor -> L0
+    com.android.tools.r8.graph.DexString listDescriptor -> m1
+    com.android.tools.r8.graph.DexType stringBuilderType -> A2
+    com.android.tools.r8.graph.DexType voidType -> Y1
+    com.android.tools.r8.graph.DexType autoCloseableType -> z2
+    com.android.tools.r8.graph.DexString getNameName -> u0
+    com.android.tools.r8.graph.DexType booleanType -> Q1
+    com.android.tools.r8.graph.DexType objectsType -> r2
+    com.android.tools.r8.graph.DexType listIteratorType -> R3
     com.android.tools.r8.graph.DexString boxedNumberDescriptor -> K
-    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> j3
-    com.android.tools.r8.graph.DexType stringType -> j2
+    com.android.tools.r8.graph.DexType charSequenceArrayType -> j2
+    com.android.tools.r8.graph.DexType nullValueType -> k4
+    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> l3
     com.android.tools.r8.graph.DexString compareToMethodName -> d0
-    com.android.tools.r8.graph.DexString npeDescriptor -> D1
-    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> J3
+    com.android.tools.r8.graph.DexString noSuchFieldErrorDescriptor -> D1
+    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> J3
     java.util.Map setFiles -> n
-    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
+    com.android.tools.r8.graph.DexType boxedCharType -> b2
+    com.android.tools.r8.graph.DexString convertMethodName -> l0
+    com.android.tools.r8.graph.DexType annotationInnerClass -> B3
+    com.android.tools.r8.graph.DexString classConstructorMethodName -> L1
+    com.android.tools.r8.graph.DexType noClassDefFoundErrorType -> Z2
     java.util.concurrent.ConcurrentHashMap methodHandles -> f
-    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 constructorDescriptor -> T0
+    com.android.tools.r8.graph.DexString consumerDescriptor -> u1
+    com.android.tools.r8.graph.DexType consumerType -> R2
     com.android.tools.r8.graph.DexString unboxBooleanMethodName -> L
-    com.android.tools.r8.graph.DexType setType -> J2
-    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> H2
+    com.android.tools.r8.graph.DexType listType -> J2
+    com.android.tools.r8.graph.DexType serviceLoaderType -> H2
+    boolean skipNameValidationForTesting -> j4
     com.android.tools.r8.graph.DexString lengthMethodName -> U
-    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> n3
     com.android.tools.r8.graph.DexString charDescriptor -> v
-    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 invokeExactMethodName -> G0
+    com.android.tools.r8.graph.DexString methodTypeDescriptor -> h1
+    com.android.tools.r8.graph.DexType noSuchFieldErrorType -> a3
+    com.android.tools.r8.graph.DexString objectArrayDescriptor -> O0
+    com.android.tools.r8.graph.DexString mapEntryDescriptor -> p1
+    com.android.tools.r8.graph.DexType shortType -> X1
+    com.android.tools.r8.graph.DexType classLoaderType -> y2
     com.android.tools.r8.graph.DexString boxedCharDescriptor -> E
-    com.android.tools.r8.graph.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 getTypeNameName -> x0
+    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> W3
+    com.android.tools.r8.graph.DexType iteratorType -> Q3
+    com.android.tools.r8.graph.DexType annotationType -> q2
+    java.util.Set libraryMethodsReturningNonNull -> e4
+    com.android.tools.r8.graph.DexType charSequenceType -> i2
+    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> I3
+    com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> G1
     com.android.tools.r8.graph.DexString containsMethodName -> V
     com.android.tools.r8.graph.DexString doubleDescriptor -> w
     com.android.tools.r8.graph.DexString substringName -> g0
-    com.android.tools.r8.graph.DexType 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.DexType boxedByteType -> a2
+    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> A3
+    com.android.tools.r8.graph.DexString getClassMethodName -> o0
+    com.android.tools.r8.graph.DexItemFactory$StringMethods stringMethods -> h3
+    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> Y2
+    com.android.tools.r8.graph.DexItemFactory$ObjectMethods objectMethods -> g3
+    com.android.tools.r8.graph.DexType annotationEnclosingClass -> z3
     com.android.tools.r8.graph.DexString boxedDoubleDescriptor -> F
-    com.android.tools.r8.graph.DexString 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 enumDescriptor -> W0
+    com.android.tools.r8.graph.DexString arraysDescriptor -> x1
+    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> v3
+    com.android.tools.r8.graph.DexType supplierType -> Q2
+    com.android.tools.r8.graph.DexType proxyType -> G2
+    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> f3
+    com.android.tools.r8.graph.DexString methodHandleDescriptor -> g1
+    com.android.tools.r8.graph.DexString invokeMethodName -> F0
     com.android.tools.r8.graph.DexString startsWithMethodName -> W
     com.android.tools.r8.graph.DexString floatDescriptor -> x
-    com.android.tools.r8.graph.DexString objectArrayDescriptor -> N0
-    com.android.tools.r8.graph.DexString mapEntryDescriptor -> o1
+    com.android.tools.r8.graph.DexString objectDescriptor -> N0
+    com.android.tools.r8.graph.DexString mapDescriptor -> o1
     boolean sorted -> s
-    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.DexType longType -> W1
+    com.android.tools.r8.graph.DexType classType -> x2
     com.android.tools.r8.graph.DexString boxedFloatDescriptor -> G
-    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 getSimpleNameName -> w0
+    com.android.tools.r8.graph.DexType charArrayType -> O1
+    com.android.tools.r8.graph.DexType enumType -> p2
+    com.android.tools.r8.graph.DexType lookupType -> P3
+    java.util.Set libraryMethodsReturningReceiver -> d4
+    com.android.tools.r8.graph.DexType boxedNumberType -> h2
+    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> H3
     com.android.tools.r8.graph.DexString cloneMethodName -> f0
-    com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> F1
+    com.android.tools.r8.graph.DexString reflectiveOperationExceptionDescriptor -> F1
     com.android.tools.r8.graph.DexString endsWithMethodName -> X
     com.android.tools.r8.graph.DexString intDescriptor -> y
-    com.android.tools.r8.graph.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.DexType stringConcatFactoryType -> a4
+    com.android.tools.r8.graph.DexString initMethodName -> n0
+    com.android.tools.r8.graph.DexString charArrayDescriptor -> N1
+    com.android.tools.r8.graph.DexType icceType -> X2
+    com.android.tools.r8.graph.DexType annotationDefault -> y3
+    com.android.tools.r8.graph.DexString methodDescriptor -> V0
+    com.android.tools.r8.graph.DexString optionalDescriptor -> w1
     com.android.tools.r8.graph.DexString boxedIntDescriptor -> H
-    com.android.tools.r8.graph.DexType supplierType -> P2
-    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> u3
+    com.android.tools.r8.graph.DexType callableType -> P2
     1:41:void <clinit>():61:101 -> <clinit>
     1:1:void <init>():105:105 -> <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>
+    2:364:void <init>():65:427 -> <init>
+    365:413:void <init>():417:465 -> <init>
+    414:430:void <init>():455:471 -> <init>
+    431:449:void <init>():468:486 -> <init>
+    450:470:void <init>():477:497 -> <init>
+    471:503:void <init>():490:522 -> <init>
+    504:508:void <init>():521:525 -> <init>
+    509:512:void <init>():524:527 -> <init>
+    513:550:void <init>():518:555 -> <init>
+    551:553:void <init>():106:108 -> <init>
+    554:554:void <init>():107:107 -> <init>
     com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame lambda$createSetInlineFrame$4(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame) -> a
     1:1:com.android.tools.r8.graph.DexType access$1900(com.android.tools.r8.graph.DexItemFactory):61:61 -> a
     2:2:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> a
-    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):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
+    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):430:431 -> a
+    5:7:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):443:445 -> a
+    8:8:com.android.tools.r8.utils.Pair lambda$mapToPredicate$1(java.util.function.Predicate,com.android.tools.r8.graph.DexMethod):532:532 -> a
+    9:9:java.util.stream.Stream mapToPredicate(java.util.Set,java.util.function.Predicate):532:532 -> a
+    10:10:void setSkipNameValidationForTesting(boolean):558:558 -> a
+    11:12:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1156:1157 -> a
     13:13:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> a
-    13:13:com.android.tools.r8.graph.DexItem canonicalize(java.util.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
+    13:13:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1157 -> a
+    14:15:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1157:1158 -> a
+    16:17:com.android.tools.r8.graph.DexString createString(int,byte[]):1163:1164 -> a
+    18:19:com.android.tools.r8.graph.DexString createString(java.lang.String):1168:1169 -> a
+    20:20:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$3(com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.dex.ClassesChecksum):1205:1205 -> a
+    21:22:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1231:1232 -> a
+    23:25:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):1236:1238 -> a
+    26:26:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1242:1242 -> a
+    27:29:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString):1246:1248 -> a
+    30:33:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1252:1255 -> a
+    34:39:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1321:1326 -> a
+    34:39:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1256 -> a
+    40:40:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1253:1253 -> a
+    41:41:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):1260:1260 -> a
+    42:45:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1270:1273 -> a
+    46:48:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1272:1274 -> a
+    49:53:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1287:1291 -> a
+    54:63:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1308:1317 -> a
+    54:63:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1291 -> a
+    64:70:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1292:1298 -> a
+    71:75:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1297:1301 -> a
+    76:78:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):1330:1332 -> a
+    79:79:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> a
+    80:82:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):1343:1345 -> a
+    83:84:com.android.tools.r8.graph.DexCallSite createCallSite(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):1354:1355 -> a
+    85:94:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString[]):1363:1372 -> a
+    95:97:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):1376:1378 -> a
+    98:100:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):1414:1416 -> a
+    101:103:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):1421:1423 -> a
+    104:104:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):1431:1431 -> a
+    105:107:void clearTypeLatticeElementsCache():1435:1437 -> a
+    108:115:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1464:1471 -> a
+    116:144:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1470:1498 -> a
+    145:153:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1478:1486 -> a
+    154:165:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1485:1496 -> a
+    166:167:java.util.Set getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1503:1504 -> a
+    168:169:java.util.Set lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1507:1508 -> a
+    170:174:void assignSortedIndices(java.util.Collection,com.android.tools.r8.naming.NamingLens):1515:1519 -> a
+    175:175:int lambda$assignSortedIndices$7(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):1516:1516 -> a
+    176:182:void sort(com.android.tools.r8.naming.NamingLens):1524:1530 -> a
+    183:183:void forAllTypes(java.util.function.Consumer):1547:1547 -> a
+    1:7:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1209:1215 -> b
+    8:10:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1214:1216 -> b
     11:11:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> b
-    11:11:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):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:
+    11:11:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1216 -> b
+    12:13:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1216:1217 -> b
+    14:14:com.android.tools.r8.graph.DexType createType(java.lang.String):1223:1223 -> b
+    15:17:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):1382:1384 -> b
+    18:18:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():1406:1406 -> b
+    19:19:boolean isConstructor(com.android.tools.r8.graph.DexMethod):1427:1427 -> b
+    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):566:566 -> c
+    2:2:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1173:1173 -> c
+    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):1227:1227 -> c
+    4:6:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):1388:1390 -> c
+    7:7:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():1410:1410 -> c
+    1:2:com.android.tools.r8.dex.ClassesChecksum extractChecksum():1204:1205 -> d
+    3:3:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$2(com.android.tools.r8.graph.DexString):1204:1204 -> d
+    4:6:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):1394:1396 -> d
+    1:5:java.util.Collection extractMarker():1179:1183 -> e
+    6:8:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):1400:1402 -> e
+    1:5:java.util.List extractMarkers():1193:1197 -> f
+    1:1:boolean getSkipNameValidationForTesting():562:562 -> g
+    1:10:void resetSortedIndices():1534:1543 -> h
+    1:3:boolean verifyNoCachedTypeLatticeElements():1441:1443 -> i
+    1:12:java.util.Set boxedValueOfMethods():440:451 -> j
+com.android.tools.r8.graph.DexItemFactory$1 -> com.android.tools.r8.graph.W$a:
+com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods -> com.android.tools.r8.graph.W$b:
     com.android.tools.r8.graph.DexMethod initMessageAndCause -> b
     com.android.tools.r8.graph.DexMethod initMessage -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):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:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):616:616 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):620:625 -> <init>
+com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods -> com.android.tools.r8.graph.W$c:
     java.util.Set updaters -> d
     com.android.tools.r8.graph.DexMethod referenceUpdater -> c
     com.android.tools.r8.graph.DexMethod longUpdater -> b
     com.android.tools.r8.graph.DexMethod intUpdater -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):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:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):830:830 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):836:855 -> <init>
+    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):859:859 -> a
+com.android.tools.r8.graph.DexItemFactory$ClassMethods -> com.android.tools.r8.graph.W$d:
     com.android.tools.r8.graph.DexMethod newInstance -> l
     com.android.tools.r8.graph.DexMethod getDeclaredMethod -> k
     com.android.tools.r8.graph.DexMethod getMethod -> j
@@ -17611,48 +17640,48 @@
     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):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:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):659:659 -> <init>
+    2:31:void <init>(com.android.tools.r8.graph.DexItemFactory):676:705 -> <init>
+    1:1:java.util.Set access$1700(com.android.tools.r8.graph.DexItemFactory$ClassMethods):659:659 -> a
+    2:2:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):709:709 -> a
+    1:1:boolean isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):713:713 -> b
+com.android.tools.r8.graph.DexItemFactory$ConstructorMethods -> com.android.tools.r8.graph.W$e:
     com.android.tools.r8.graph.DexMethod newInstance -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):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:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):717:717 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):721:723 -> <init>
+com.android.tools.r8.graph.DexItemFactory$EnumMethods -> com.android.tools.r8.graph.W$f:
     com.android.tools.r8.graph.DexMethod toString -> d
     com.android.tools.r8.graph.DexMethod name -> c
     com.android.tools.r8.graph.DexMethod ordinal -> b
     com.android.tools.r8.graph.DexMethod valueOf -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):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:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):731:731 -> <init>
+    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):738:758 -> <init>
+com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods -> com.android.tools.r8.graph.W$g:
     com.android.tools.r8.graph.DexMethod asList -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):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):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:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):579:579 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):583:587 -> <init>
+    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):585:585 -> <init>
+com.android.tools.r8.graph.DexItemFactory$LongMethods -> com.android.tools.r8.graph.W$h:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):569:569 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):573:575 -> <init>
+    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):574:574 -> <init>
+com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.graph.W$i:
     com.android.tools.r8.graph.DexMethod init -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):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:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):766:766 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):770:772 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ObjectMethods -> com.android.tools.r8.graph.W$j:
     com.android.tools.r8.graph.DexMethod toString -> d
     com.android.tools.r8.graph.DexMethod finalize -> c
     com.android.tools.r8.graph.DexMethod constructor -> b
     com.android.tools.r8.graph.DexMethod getClass -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):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:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):630:630 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.DexItemFactory):637:644 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> com.android.tools.r8.graph.W$k:
     com.android.tools.r8.graph.DexMethod requireNonNull -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):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:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):649:649 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):653:655 -> <init>
+    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):654:654 -> <init>
+com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.graph.W$l:
     com.android.tools.r8.graph.DexProto compareAndSetSignature -> c
     java.util.Set varHandleMethods -> d
     com.android.tools.r8.graph.DexItemFactory this$0 -> g
@@ -17660,10 +17689,10 @@
     java.util.Set varHandleCompareAndSetMethods -> f
     com.android.tools.r8.graph.DexProto signature -> a
     com.android.tools.r8.graph.DexProto setSignature -> b
-    1:36:void <init>(com.android.tools.r8.graph.DexItemFactory):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:
+    1:36:void <init>(com.android.tools.r8.graph.DexItemFactory):1044:1079 -> <init>
+    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):1087:1097 -> a
+    12:17:java.util.Set createStrings(java.lang.String[]):1104:1109 -> a
+com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> com.android.tools.r8.graph.W$m:
     com.android.tools.r8.graph.DexField longTYPE -> f
     com.android.tools.r8.graph.DexField intTYPE -> e
     com.android.tools.r8.graph.DexField doubleTYPE -> h
@@ -17673,25 +17702,25 @@
     com.android.tools.r8.graph.DexField booleanTYPE -> a
     com.android.tools.r8.graph.DexField shortTYPE -> d
     com.android.tools.r8.graph.DexField charTYPE -> c
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):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:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):786:786 -> <init>
+    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):798:818 -> <init>
+    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):822:822 -> a
+com.android.tools.r8.graph.DexItemFactory$ProxyMethods -> com.android.tools.r8.graph.W$n:
     com.android.tools.r8.graph.DexMethod newProxyInstance -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):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:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1113:1113 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1117:1122 -> <init>
+    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1119:1119 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> com.android.tools.r8.graph.W$o:
     com.android.tools.r8.graph.DexMethod iterator -> d
     com.android.tools.r8.graph.DexMethod loadInstalled -> c
     com.android.tools.r8.graph.DexMethod loadWithClassLoader -> b
     com.android.tools.r8.graph.DexMethod load -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):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:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1126:1126 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1133:1139 -> <init>
+    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1137:1145 -> <init>
+    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1142:1147 -> <init>
+    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):1151:1151 -> a
+com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> com.android.tools.r8.graph.W$p:
     com.android.tools.r8.graph.DexMethod defaultConstructor -> o
     com.android.tools.r8.graph.DexMethod charSequenceConstructor -> n
     com.android.tools.r8.graph.DexMethod appendStringBuffer -> m
@@ -17713,14 +17742,14 @@
     com.android.tools.r8.graph.DexMethod toString -> r
     com.android.tools.r8.graph.DexMethod stringConstructor -> q
     com.android.tools.r8.graph.DexMethod intConstructor -> p
-    1:1:void <clinit>():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:
+    1:1:void <clinit>():936:936 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):936:936 -> <init>
+    2:46:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):960:1004 -> <init>
+    1:1:java.util.Set access$1600(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):936:936 -> a
+    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):1009:1009 -> a
+    3:29:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1013:1039 -> a
+    1:1:java.util.Set access$1800(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):936:936 -> b
+com.android.tools.r8.graph.DexItemFactory$StringMethods -> com.android.tools.r8.graph.W$q:
     com.android.tools.r8.graph.DexMethod hashCode -> o
     com.android.tools.r8.graph.DexMethod compareToIgnoreCase -> n
     com.android.tools.r8.graph.DexMethod compareTo -> m
@@ -17736,22 +17765,25 @@
     com.android.tools.r8.graph.DexMethod contains -> c
     com.android.tools.r8.graph.DexMethod length -> b
     com.android.tools.r8.graph.DexMethod isEmpty -> a
+    com.android.tools.r8.graph.DexItemFactory this$0 -> t
+    com.android.tools.r8.graph.DexMethod trim -> s
     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):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:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):863:863 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):888:888 -> <init>
+    3:48:void <init>(com.android.tools.r8.graph.DexItemFactory):886:931 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> com.android.tools.r8.graph.W$r:
     com.android.tools.r8.graph.DexMethod initCause -> d
     com.android.tools.r8.graph.DexMethod getSuppressed -> c
     com.android.tools.r8.graph.DexMethod getMessage -> b
     com.android.tools.r8.graph.DexMethod addSuppressed -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):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:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):593:593 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):600:602 -> <init>
+    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):601:604 -> <init>
+    9:16:void <init>(com.android.tools.r8.graph.DexItemFactory):603:610 -> <init>
+    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):608:608 -> <init>
+com.android.tools.r8.graph.DexLibraryClass -> com.android.tools.r8.graph.X:
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():17:17 -> <clinit>
     1:27:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],boolean):37:63 -> <init>
@@ -17759,10 +17791,10 @@
     boolean isLibraryClass() -> Q
     boolean isNotProgramClass() -> V
     1:1:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):74:74 -> a
-    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():119:119 -> a
+    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():118:118 -> a
     2:2:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):74 -> a
     3:4:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):74:75 -> a
-    5:5:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():115:115 -> a
+    5:5:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():114:114 -> a
     5:5:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):75 -> a
     6:6:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):75:75 -> a
     7:7:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):98:98 -> a
@@ -17771,7 +17803,7 @@
     com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> p
     1:1:java.lang.String toSourceString():92:92 -> toSourceString
     1:1:java.lang.String toString():87:87 -> toString
-com.android.tools.r8.graph.DexMemberAnnotation -> com.android.tools.r8.graph.X:
+com.android.tools.r8.graph.DexMemberAnnotation -> com.android.tools.r8.graph.Y:
     com.android.tools.r8.graph.Descriptor item -> a
     com.android.tools.r8.graph.DexItem annotations -> b
     1:3:void <init>(com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexItem):14:16 -> <init>
@@ -17779,13 +17811,13 @@
     1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):28:28 -> collectMixedSectionItems
     1:3:boolean equals(java.lang.Object):41:43 -> equals
     1:1:int hashCode():33:33 -> hashCode
-com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation -> com.android.tools.r8.graph.X$a:
+com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation -> com.android.tools.r8.graph.Y$a:
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexAnnotationSet):51:51 -> <init>
-com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation -> com.android.tools.r8.graph.X$b:
+com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation -> com.android.tools.r8.graph.Y$b:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexAnnotationSet):58:58 -> <init>
-com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation -> com.android.tools.r8.graph.X$c:
+com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation -> com.android.tools.r8.graph.Y$c:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ParameterAnnotationsList):66:66 -> <init>
-com.android.tools.r8.graph.DexMethod -> com.android.tools.r8.graph.Y:
+com.android.tools.r8.graph.DexMethod -> com.android.tools.r8.graph.Z:
     com.android.tools.r8.graph.DexProto proto -> d
     com.android.tools.r8.graph.DexString name -> e
     com.android.tools.r8.graph.DexType holder -> c
@@ -17795,32 +17827,35 @@
     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
     2:2:boolean match(com.android.tools.r8.graph.DexItem):12:12 -> a
-    3:3:int slowCompareTo(java.lang.Object):12:12 -> a
-    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):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
-    17:17:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):143 -> a
-    18:18:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):147:147 -> a
-    19:19:int com.android.tools.r8.graph.DexProto.compareTo(com.android.tools.r8.graph.DexProto):63:63 -> a
-    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):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
-    23:23:boolean match(com.android.tools.r8.graph.DexEncodedMethod):157 -> a
-    24:35:java.lang.String toSourceString(boolean):179:190 -> a
-    36:36:void setSingleVirtualMethodCache(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):200:200 -> a
-    37:37:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
-    37:37:void setSingleVirtualMethodCache(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):201 -> a
-    38:40:void setSingleVirtualMethodCache(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):201:203 -> a
-    41:42:com.android.tools.r8.graph.DexEncodedMethod getSingleVirtualMethodCache(com.android.tools.r8.graph.DexType):211:212 -> a
-    1:1:boolean isSingleVirtualMethodCached(com.android.tools.r8.graph.DexType):207:207 -> b
+    3:3:boolean match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    3:3:boolean match(com.android.tools.r8.graph.DexItem):12 -> a
+    4:4:int slowCompareTo(java.lang.Object):12:12 -> a
+    5:5:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):67:67 -> a
+    6:6:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):139:139 -> a
+    7:7:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
+    7:7:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):139 -> a
+    8:8:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):143:143 -> a
+    9:9:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):241:241 -> a
+    9:9:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):143 -> a
+    10:10:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):147:147 -> a
+    11:11:int com.android.tools.r8.graph.DexProto.compareTo(com.android.tools.r8.graph.DexProto):63:63 -> a
+    11:11:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):147 -> a
+    12:12:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):241:241 -> a
+    12:12:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):143 -> a
+    13:13:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
+    13:13:int layeredCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):139 -> a
+    14:14:boolean match(com.android.tools.r8.graph.DexMethod):152:152 -> a
+    15:26:java.lang.String toSourceString(boolean):179:190 -> a
+    27:27:void setSingleVirtualMethodCache(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):200:200 -> a
+    28:28:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
+    28:28:void setSingleVirtualMethodCache(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):201 -> a
+    29:31:void setSingleVirtualMethodCache(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):201:203 -> a
+    32:32:com.android.tools.r8.graph.DexEncodedMethod getSingleVirtualMethodCache(com.android.tools.r8.graph.DexType):211:211 -> a
+    33:33:boolean isSingleVirtualMethodCached(com.android.tools.r8.graph.DexType):207:207 -> a
+    33:33:com.android.tools.r8.graph.DexEncodedMethod getSingleVirtualMethodCache(com.android.tools.r8.graph.DexType):211 -> a
+    34:35:com.android.tools.r8.graph.DexEncodedMethod getSingleVirtualMethodCache(com.android.tools.r8.graph.DexType):211:212 -> a
+    1:9:int slowCompareTo(com.android.tools.r8.graph.DexMethod):113:121 -> b
+    10:10:boolean isSingleVirtualMethodCached(com.android.tools.r8.graph.DexType):207:207 -> b
     1:3:boolean collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):52:54 -> collectIndexedItems
     1:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):45 -> collectIndexedItems
     4:4:void collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):62:62 -> collectIndexedItems
@@ -17841,7 +17876,7 @@
     1:1:java.lang.String toSmaliString():166:166 -> toSmaliString
     1:1:java.lang.String toSourceString():171:171 -> toSourceString
     1:1:java.lang.String toString():35:35 -> toString
-com.android.tools.r8.graph.DexMethodHandle -> com.android.tools.r8.graph.Z:
+com.android.tools.r8.graph.DexMethodHandle -> com.android.tools.r8.graph.a0:
     com.android.tools.r8.graph.Descriptor fieldOrMethod -> d
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType type -> c
     boolean isInterface -> e
@@ -17930,7 +17965,7 @@
     7:7:boolean isStaticHandle():301 -> j
     1:1:java.lang.String toSmaliString():289:289 -> toSmaliString
     1:6:java.lang.String toString():255:260 -> toString
-com.android.tools.r8.graph.DexMethodHandle$MethodHandleType -> com.android.tools.r8.graph.Z$a:
+com.android.tools.r8.graph.DexMethodHandle$MethodHandleType -> com.android.tools.r8.graph.a0$a:
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType INVOKE_CONSTRUCTOR -> h
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType INVOKE_INSTANCE -> g
@@ -17995,7 +18030,7 @@
     21:21:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():171:171 -> i
     22:22:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():169:169 -> i
     1:1:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType[] values():18:18 -> j
-com.android.tools.r8.graph.DexProgramClass -> com.android.tools.r8.graph.a0:
+com.android.tools.r8.graph.DexProgramClass -> com.android.tools.r8.graph.b0:
     java.util.Collection synthesizedFrom -> u
     com.android.tools.r8.kotlin.KotlinInfo kotlinInfo -> w
     com.android.tools.r8.graph.DexEncodedArray staticValues -> t
@@ -18029,7 +18064,7 @@
     4:6:void synchronizedCollectAll(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexItem[]):202:204 -> b
     7:7:java.util.Iterator lambda$asProgramClasses$2(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):444:444 -> b
     1:12:void computeStaticValues():291:302 -> b0
-    13:13:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):147:147 -> b0
+    13:13:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):150:150 -> b0
     13:13:void computeStaticValues():302 -> b0
     14:16:void computeStaticValues():308:310 -> b0
     1:3:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedField[]):270:272 -> c
@@ -18078,7 +18113,7 @@
     com.android.tools.r8.graph.DexProgramClass asProgramClass() -> q
     1:1:java.lang.String toSourceString():214:214 -> toSourceString
     1:1:java.lang.String toString():209:209 -> toString
-com.android.tools.r8.graph.DexProgramClass$1 -> com.android.tools.r8.graph.a0$a:
+com.android.tools.r8.graph.DexProgramClass$1 -> com.android.tools.r8.graph.b0$a:
     java.util.Iterator iterator -> b
     com.android.tools.r8.graph.DexProgramClass next -> a
     java.lang.Iterable val$types -> c
@@ -18088,7 +18123,7 @@
     1:1:boolean hasNext():452:452 -> hasNext
     1:2:com.android.tools.r8.graph.DexProgramClass next():457:458 -> next
     1:2:java.lang.Object next():444 -> next
-com.android.tools.r8.graph.DexProto -> com.android.tools.r8.graph.b0:
+com.android.tools.r8.graph.DexProto -> com.android.tools.r8.graph.c0:
     com.android.tools.r8.graph.DexString shorty -> c
     com.android.tools.r8.graph.DexTypeList parameters -> e
     com.android.tools.r8.graph.DexProto SENTINEL -> f
@@ -18128,7 +18163,7 @@
     1:1:java.lang.String toDescriptorString():99:99 -> toSmaliString
     1:1:java.lang.String toSmaliString():95 -> toSmaliString
     1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.graph.DexReference -> com.android.tools.r8.graph.c0:
+com.android.tools.r8.graph.DexReference -> com.android.tools.r8.graph.d0:
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():14:14 -> <init>
     1:1:java.util.stream.Stream filterDexReference(java.util.stream.Stream):59:59 -> a
@@ -18141,7 +18176,7 @@
     boolean isDexField() -> k
     boolean isDexMethod() -> l
     boolean isDexType() -> m
-com.android.tools.r8.graph.DexString -> com.android.tools.r8.graph.d0:
+com.android.tools.r8.graph.DexString -> com.android.tools.r8.graph.e0:
     boolean $assertionsDisabled -> f
     byte[] content -> d
     int size -> c
@@ -18194,7 +18229,7 @@
     16:25:java.lang.String decode():130:139 -> n
     26:30:java.lang.String decode():137:141 -> n
     1:3:java.lang.String toString():92:94 -> toString
-com.android.tools.r8.graph.DexString$1 -> com.android.tools.r8.graph.d0$a:
+com.android.tools.r8.graph.DexString$1 -> com.android.tools.r8.graph.e0$a:
     com.android.tools.r8.graph.DexString this$0 -> b
     boolean $assertionsDisabled -> c
     int i -> a
@@ -18203,7 +18238,7 @@
     1:24:char nextChar():42:65 -> a
     25:25:char nextChar():43:43 -> a
     1:1:boolean hasNext():70:70 -> hasNext
-com.android.tools.r8.graph.DexType -> com.android.tools.r8.graph.e0:
+com.android.tools.r8.graph.DexType -> com.android.tools.r8.graph.f0:
     com.android.tools.r8.graph.DexString descriptor -> c
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexType[] EMPTY_ARRAY -> e
@@ -18272,7 +18307,7 @@
     1:1:boolean isDoubleType():224:224 -> x
     1:1:boolean isIntType():212:212 -> y
     1:1:boolean isLongType():220:220 -> z
-com.android.tools.r8.graph.DexTypeList -> com.android.tools.r8.graph.f0:
+com.android.tools.r8.graph.DexTypeList -> com.android.tools.r8.graph.g0:
     com.android.tools.r8.graph.DexType[] values -> a
     com.android.tools.r8.graph.DexTypeList theEmptyTypeList -> b
     boolean $assertionsDisabled -> c
@@ -18295,19 +18330,19 @@
 com.android.tools.r8.graph.DexValue -> com.android.tools.r8.graph.DexValue:
     com.android.tools.r8.graph.DexValue$UnknownDexValue UNKNOWN -> b
     com.android.tools.r8.graph.DexValue[] EMPTY_ARRAY -> a
-    1:3:void <clinit>():26:28 -> <clinit>
-    1:1:void <init>():25:25 -> <init>
-    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) -> a
+    1:3:void <clinit>():28:30 -> <clinit>
+    1:1:void <init>():27:27 -> <init>
+    com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo) -> a
     void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping) -> a
-    1:22:com.android.tools.r8.graph.DexValue fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):59:80 -> a
-    23:36:com.android.tools.r8.graph.DexValue fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):74:87 -> a
-    37:57:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):115:135 -> a
-    58:74:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):117:133 -> a
-    75:75:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):127:127 -> a
-    76:82:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):125:131 -> a
-    83:83:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):121:121 -> a
-    84:84:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):119:119 -> a
-    1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):98:98 -> collectMixedSectionItems
+    1:22:com.android.tools.r8.graph.DexValue fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):61:82 -> a
+    23:36:com.android.tools.r8.graph.DexValue fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):76:89 -> a
+    37:57:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):117:137 -> a
+    58:74:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):119:135 -> a
+    75:75:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):129:129 -> a
+    76:82:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):127:133 -> a
+    83:83:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):123:123 -> a
+    84:84:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):121:121 -> a
+    1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):100:100 -> collectMixedSectionItems
     java.lang.Object asAsmEncodedObject() -> f
     com.android.tools.r8.graph.DexValue$DexValueMethodHandle asDexValueMethodHandle() -> g
     com.android.tools.r8.graph.DexValue$DexValueMethodType asDexValueMethodType() -> h
@@ -18318,265 +18353,278 @@
 com.android.tools.r8.graph.DexValue$DexItemBasedValueString -> com.android.tools.r8.graph.DexValue$b:
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():752:752 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):757:758 -> <init>
-    1: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):777:781 -> a
-    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):787:787 -> a
-    1:1:void com.android.tools.r8.graph.DexValue$NestedDexValue.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):688:688 -> collectIndexedItems
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):752 -> collectIndexedItems
-    1:1:boolean equals(java.lang.Object):752:752 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():767:767 -> f
-    1:1:int hashCode():752:752 -> hashCode
-    1:1:java.lang.Object getBoxedValue():752:752 -> i
+    1:1:void <clinit>():776:776 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):781:782 -> <init>
+    1:8:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):802:809 -> a
+    9:9:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):817:817 -> a
+    1:1:void com.android.tools.r8.graph.DexValue$NestedDexValue.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):709:709 -> collectIndexedItems
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):776 -> collectIndexedItems
+    1:1:boolean equals(java.lang.Object):776:776 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():791:791 -> f
+    1:1:int hashCode():776:776 -> hashCode
+    1:1:java.lang.Object getBoxedValue():776:776 -> i
     void sort() -> k
     byte getValueKind() -> l
-    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():762:762 -> m
-    1:1:java.lang.String toString():752:752 -> toString
+    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():786:786 -> m
+    1:1:java.lang.String toString():776:776 -> toString
 com.android.tools.r8.graph.DexValue$DexValueAnnotation -> com.android.tools.r8.graph.DexValue$c:
     com.android.tools.r8.graph.DexEncodedAnnotation value -> c
-    1:2:void <init>(com.android.tools.r8.graph.DexEncodedAnnotation):958:959 -> <init>
-    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    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):970 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):971:971 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):965:965 -> collectIndexedItems
+    1:2:void <init>(com.android.tools.r8.graph.DexEncodedAnnotation):988:989 -> <init>
+    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    1:1:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1000 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1001:1001 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):995:995 -> collectIndexedItems
     2:3:void com.android.tools.r8.graph.DexEncodedAnnotation.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):29:30 -> collectIndexedItems
-    2:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):965 -> collectIndexedItems
-    1:3:boolean equals(java.lang.Object):999:1001 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():981:981 -> f
-    1:1:int hashCode():991:991 -> hashCode
-    1:1:java.lang.Object getBoxedValue():976:976 -> i
-    1:1:void sort():986:986 -> k
-    1:1:java.lang.String toString():1008:1008 -> toString
+    2:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):995 -> collectIndexedItems
+    1:3:boolean equals(java.lang.Object):1029:1031 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():1011:1011 -> f
+    1:1:int hashCode():1021:1021 -> hashCode
+    1:1:java.lang.Object getBoxedValue():1006:1006 -> i
+    1:1:void sort():1016:1016 -> k
+    1:1:java.lang.String toString():1038:1038 -> toString
 com.android.tools.r8.graph.DexValue$DexValueArray -> com.android.tools.r8.graph.DexValue$d:
     com.android.tools.r8.graph.DexValue[] values -> c
-    1:2:void <init>(com.android.tools.r8.graph.DexValue[]):891:892 -> <init>
-    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    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):907 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):908:908 -> a
+    1:2:void <init>(com.android.tools.r8.graph.DexValue[]):921:922 -> <init>
+    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    1:1:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):937 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):938:938 -> a
     3:3:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):908 -> a
-    4:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):909:910 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):902:902 -> collectIndexedItems
-    1:3:boolean equals(java.lang.Object):941:943 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():921:921 -> f
-    1:1:int hashCode():933:933 -> hashCode
-    1:1:java.lang.Object getBoxedValue():916:916 -> i
-    1:2:void sort():926:927 -> k
-    1:1:com.android.tools.r8.graph.DexValue[] getValues():896:896 -> l
-    1:1:java.lang.String toString():950:950 -> toString
+    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):938 -> a
+    4:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):939:940 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):932:932 -> collectIndexedItems
+    1:3:boolean equals(java.lang.Object):971:973 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():951:951 -> f
+    1:1:int hashCode():963:963 -> hashCode
+    1:1:java.lang.Object getBoxedValue():946:946 -> i
+    1:2:void sort():956:957 -> k
+    1:1:com.android.tools.r8.graph.DexValue[] getValues():926:926 -> l
+    1:1:java.lang.String toString():980:980 -> toString
 com.android.tools.r8.graph.DexValue$DexValueBoolean -> com.android.tools.r8.graph.DexValue$e:
     com.android.tools.r8.graph.DexValue$DexValueBoolean TRUE -> d
     com.android.tools.r8.graph.DexValue$DexValueBoolean FALSE -> e
     com.android.tools.r8.graph.DexValue$DexValueBoolean DEFAULT -> f
     boolean value -> c
-    1:4:void <clinit>():1068:1071 -> <clinit>
-    1:2:void <init>(boolean):1075:1076 -> <init>
-    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean create(boolean):1080:1080 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1094:1094 -> a
-    3:3:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    3:3:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):25 -> a
-    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1094 -> a
-    4:4: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):1122:1122 -> a
-    1:1:boolean equals(java.lang.Object):1112:1112 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():1099:1099 -> f
-    1:1:boolean getValue():1084:1084 -> getValue
-    1:1:int hashCode():1104:1104 -> hashCode
-    1:1:java.lang.Object getBoxedValue():1089:1089 -> i
+    1:4:void <clinit>():1096:1099 -> <clinit>
+    1:2:void <init>(boolean):1103:1104 -> <init>
+    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean create(boolean):1108:1108 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1122:1122 -> a
+    3:3:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    3:3:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1122 -> a
+    4:4:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1151:1151 -> a
+    1:1:boolean equals(java.lang.Object):1140:1140 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():1127:1127 -> f
+    1:1:boolean getValue():1112:1112 -> getValue
+    1:1:int hashCode():1132:1132 -> hashCode
+    1:1:java.lang.Object getBoxedValue():1117:1117 -> i
     boolean mayHaveSideEffects() -> j
     void sort() -> k
-    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean access$000():1066:1066 -> l
-    1:1:java.lang.String toString():1117:1117 -> toString
+    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean access$000():1094:1094 -> l
+    1:1:java.lang.String toString():1145:1145 -> toString
 com.android.tools.r8.graph.DexValue$DexValueByte -> com.android.tools.r8.graph.DexValue$f:
     byte value -> c
     com.android.tools.r8.graph.DexValue$DexValueByte DEFAULT -> d
-    1:1:void <clinit>():253:253 -> <clinit>
-    1:2:void <init>(byte):257:258 -> <init>
-    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    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):276 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):277:277 -> a
+    1:1:void <clinit>():257:257 -> <clinit>
+    1:2:void <init>(byte):261:262 -> <init>
+    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    1:1:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):280 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):281:281 -> a
     3:3:int com.android.tools.r8.dex.DexOutputBuffer.putSignedEncodedValue(long,int):88:88 -> a
-    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):277 -> a
-    4:4:com.android.tools.r8.graph.DexValue$DexValueByte create(byte):262:262 -> a
-    5: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):305:305 -> a
-    1:1:boolean equals(java.lang.Object):295:295 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():282:282 -> f
-    1:1:byte getValue():266:266 -> getValue
-    1:1:int hashCode():287:287 -> hashCode
-    1:1:java.lang.Object getBoxedValue():271:271 -> i
+    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):281 -> a
+    4:4:com.android.tools.r8.graph.DexValue$DexValueByte create(byte):266:266 -> a
+    5:5:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):310:310 -> a
+    1:1:boolean equals(java.lang.Object):299:299 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():286:286 -> f
+    1:1:byte getValue():270:270 -> getValue
+    1:1:int hashCode():291:291 -> hashCode
+    1:1:java.lang.Object getBoxedValue():275:275 -> i
     boolean mayHaveSideEffects() -> j
     void sort() -> k
-    1:1:java.lang.String toString():300:300 -> toString
+    1:1:java.lang.String toString():304:304 -> toString
 com.android.tools.r8.graph.DexValue$DexValueChar -> com.android.tools.r8.graph.DexValue$g:
     com.android.tools.r8.graph.DexValue$DexValueChar DEFAULT -> d
     char value -> c
-    1:1:void <clinit>():367:367 -> <clinit>
-    1:2:void <init>(char):370:371 -> <init>
-    1:1:com.android.tools.r8.graph.DexValue$DexValueChar create(char):375:375 -> a
-    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):389:390 -> a
+    1:1:void <clinit>():373:373 -> <clinit>
+    1:2:void <init>(char):376:377 -> <init>
+    1:1:com.android.tools.r8.graph.DexValue$DexValueChar create(char):381:381 -> a
+    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):395:396 -> a
     4:4:int com.android.tools.r8.dex.DexOutputBuffer.putUnsignedEncodedValue(long,int):92:92 -> a
-    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):390 -> a
+    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):396 -> a
     5:5:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):391 -> a
-    6:6:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    6:6:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):25 -> a
-    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):392 -> a
-    7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):393:393 -> 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):421:421 -> a
-    1:1:boolean equals(java.lang.Object):411:411 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():398:398 -> f
-    1:1:char getValue():379:379 -> getValue
-    1:1:int hashCode():403:403 -> hashCode
-    1:1:java.lang.Object getBoxedValue():384:384 -> i
+    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):397 -> a
+    6:6:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    6:6:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):398 -> a
+    7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):399:399 -> a
+    8:8:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):428:428 -> a
+    1:1:boolean equals(java.lang.Object):417:417 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():404:404 -> f
+    1:1:char getValue():385:385 -> getValue
+    1:1:int hashCode():409:409 -> hashCode
+    1:1:java.lang.Object getBoxedValue():390:390 -> i
     boolean mayHaveSideEffects() -> j
     void sort() -> k
-    1:1:java.lang.String toString():416:416 -> toString
+    1:1:java.lang.String toString():422:422 -> toString
 com.android.tools.r8.graph.DexValue$DexValueDouble -> com.android.tools.r8.graph.DexValue$h:
     com.android.tools.r8.graph.DexValue$DexValueDouble DEFAULT -> d
     double value -> c
-    1:1:void <clinit>():596:596 -> <clinit>
-    1:2:void <init>(double):600:601 -> <init>
-    1:1:com.android.tools.r8.graph.DexValue$DexValueDouble create(double):605:605 -> a
-    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):619:620 -> a
+    1:1:void <clinit>():611:611 -> <clinit>
+    1:2:void <init>(double):615:616 -> <init>
+    1:1:com.android.tools.r8.graph.DexValue$DexValueDouble create(double):620:620 -> a
+    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):634:635 -> a
     4:4:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):621 -> a
-    5:5:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    5:5:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):25 -> a
-    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):622 -> a
-    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):623:623 -> a
-    1:2:boolean equals(java.lang.Object):641:642 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():628:628 -> f
-    1:1:double getValue():609:609 -> getValue
-    1:1:int hashCode():633:633 -> hashCode
-    1:1:java.lang.Object getBoxedValue():614:614 -> i
+    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):636 -> a
+    5:5:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    5:5:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):637 -> a
+    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):638:638 -> a
+    7:7:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):649:649 -> a
+    8:9:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createDoubleConstant(double,com.android.tools.r8.graph.DebugLocalInfo):1012:1013 -> a
+    8:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):649 -> a
+    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createDoubleConstant(double,com.android.tools.r8.graph.DebugLocalInfo):1012:1012 -> a
+    10:10:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):649 -> a
+    1:2:boolean equals(java.lang.Object):662:663 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():643:643 -> f
+    1:1:double getValue():624:624 -> getValue
+    1:1:int hashCode():654:654 -> hashCode
+    1:1:java.lang.Object getBoxedValue():629:629 -> i
     boolean mayHaveSideEffects() -> j
     void sort() -> k
-    1:1:java.lang.String toString():647:647 -> toString
+    1:1:java.lang.String toString():668:668 -> toString
 com.android.tools.r8.graph.DexValue$DexValueEnum -> com.android.tools.r8.graph.DexValue$i:
-    1:1:void <init>(com.android.tools.r8.graph.DexField):849:849 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):846:846 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):860:860 -> collectIndexedItems
-    1:1:boolean equals(java.lang.Object):846:846 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():846:846 -> f
-    1:1:int hashCode():846:846 -> hashCode
-    1:1:java.lang.Object getBoxedValue():846:846 -> i
+    1:1:void <init>(com.android.tools.r8.graph.DexField):879:879 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):876:876 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):890:890 -> collectIndexedItems
+    1:1:boolean equals(java.lang.Object):876:876 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():876:876 -> f
+    1:1:int hashCode():876:876 -> hashCode
+    1:1:java.lang.Object getBoxedValue():876:876 -> i
     void sort() -> k
     byte getValueKind() -> l
-    1:1:java.lang.String toString():846:846 -> toString
+    1:1:java.lang.String toString():876:876 -> toString
 com.android.tools.r8.graph.DexValue$DexValueField -> com.android.tools.r8.graph.DexValue$j:
-    1:1:void <init>(com.android.tools.r8.graph.DexField):813:813 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):810:810 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):824:824 -> collectIndexedItems
-    1:1:boolean equals(java.lang.Object):810:810 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():810:810 -> f
-    1:1:int hashCode():810:810 -> hashCode
-    1:1:java.lang.Object getBoxedValue():810:810 -> i
+    1:1:void <init>(com.android.tools.r8.graph.DexField):843:843 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):840:840 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):854:854 -> collectIndexedItems
+    1:1:boolean equals(java.lang.Object):840:840 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():840:840 -> f
+    1:1:int hashCode():840:840 -> hashCode
+    1:1:java.lang.Object getBoxedValue():840:840 -> i
     void sort() -> k
     byte getValueKind() -> l
-    1:1:java.lang.String toString():810:810 -> toString
+    1:1:java.lang.String toString():840:840 -> toString
 com.android.tools.r8.graph.DexValue$DexValueFloat -> com.android.tools.r8.graph.DexValue$k:
     float value -> c
     com.android.tools.r8.graph.DexValue$DexValueFloat DEFAULT -> d
-    1:1:void <clinit>():539:539 -> <clinit>
-    1:2:void <init>(float):542:543 -> <init>
-    1:1:com.android.tools.r8.graph.DexValue$DexValueFloat create(float):547:547 -> a
-    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):561:562 -> a
+    1:1:void <clinit>():548:548 -> <clinit>
+    1:2:void <init>(float):551:552 -> <init>
+    1:1:com.android.tools.r8.graph.DexValue$DexValueFloat create(float):556:556 -> a
+    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):570:571 -> a
     4:4:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):563 -> a
-    5:5:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    5:5:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):25 -> a
-    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):564 -> a
-    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):565:565 -> a
-    1:2:boolean equals(java.lang.Object):583:584 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():570:570 -> f
-    1:1:float getValue():551:551 -> getValue
-    1:1:int hashCode():575:575 -> hashCode
-    1:1:java.lang.Object getBoxedValue():556:556 -> i
+    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):572 -> a
+    5:5:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    5:5:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):573 -> a
+    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):574:574 -> a
+    7:7:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):585:585 -> a
+    8:9:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createFloatConstant(float,com.android.tools.r8.graph.DebugLocalInfo):1017:1018 -> a
+    8:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):585 -> a
+    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createFloatConstant(float,com.android.tools.r8.graph.DebugLocalInfo):1017:1017 -> a
+    10:10:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):585 -> a
+    1:2:boolean equals(java.lang.Object):598:599 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():579:579 -> f
+    1:1:float getValue():560:560 -> getValue
+    1:1:int hashCode():590:590 -> hashCode
+    1:1:java.lang.Object getBoxedValue():565:565 -> i
     boolean mayHaveSideEffects() -> j
     void sort() -> k
-    1:1:java.lang.String toString():589:589 -> toString
+    1:1:java.lang.String toString():604:604 -> toString
 com.android.tools.r8.graph.DexValue$DexValueInt -> com.android.tools.r8.graph.DexValue$l:
     int value -> c
     com.android.tools.r8.graph.DexValue$DexValueInt DEFAULT -> d
-    1:1:void <clinit>():427:427 -> <clinit>
-    1:2:void <init>(int):430:431 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):449:449 -> a
-    2:2: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):477:477 -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueInt create(int):435:435 -> c
-    1:1:boolean equals(java.lang.Object):467:467 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():454:454 -> f
-    1:1:int getValue():439:439 -> getValue
-    1:1:int hashCode():459:459 -> hashCode
-    1:1:java.lang.Object getBoxedValue():444:444 -> i
+    1:1:void <clinit>():434:434 -> <clinit>
+    1:2:void <init>(int):437:438 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):456:456 -> a
+    2:2:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):485:485 -> a
+    1:1:com.android.tools.r8.graph.DexValue$DexValueInt create(int):442:442 -> c
+    1:1:boolean equals(java.lang.Object):474:474 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():461:461 -> f
+    1:1:int getValue():446:446 -> getValue
+    1:1:int hashCode():466:466 -> hashCode
+    1:1:java.lang.Object getBoxedValue():451:451 -> i
     boolean mayHaveSideEffects() -> j
     void sort() -> k
-    1:1:java.lang.String toString():472:472 -> toString
+    1:1:java.lang.String toString():479:479 -> toString
 com.android.tools.r8.graph.DexValue$DexValueLong -> com.android.tools.r8.graph.DexValue$m:
     com.android.tools.r8.graph.DexValue$DexValueLong DEFAULT -> d
     long value -> c
-    1:1:void <clinit>():483:483 -> <clinit>
-    1:2:void <init>(long):486:487 -> <init>
-    1:1:com.android.tools.r8.graph.DexValue$DexValueLong create(long):491:491 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):505:505 -> a
-    3:3: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):533:533 -> a
-    1:1:boolean equals(java.lang.Object):523:523 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():510:510 -> f
-    1:1:long getValue():495:495 -> getValue
-    1:1:int hashCode():515:515 -> hashCode
-    1:1:java.lang.Object getBoxedValue():500:500 -> i
+    1:1:void <clinit>():491:491 -> <clinit>
+    1:2:void <init>(long):494:495 -> <init>
+    1:1:com.android.tools.r8.graph.DexValue$DexValueLong create(long):499:499 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):513:513 -> a
+    3:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):542:542 -> a
+    4:5:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createLongConstant(long,com.android.tools.r8.graph.DebugLocalInfo):1031:1032 -> a
+    4:5:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):542 -> a
+    6:6:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createLongConstant(long,com.android.tools.r8.graph.DebugLocalInfo):1031:1031 -> a
+    6:6:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):542 -> a
+    1:1:boolean equals(java.lang.Object):531:531 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():518:518 -> f
+    1:1:long getValue():503:503 -> getValue
+    1:1:int hashCode():523:523 -> hashCode
+    1:1:java.lang.Object getBoxedValue():508:508 -> i
     boolean mayHaveSideEffects() -> j
     void sort() -> k
-    1:1:java.lang.String toString():528:528 -> toString
+    1:1:java.lang.String toString():536:536 -> toString
 com.android.tools.r8.graph.DexValue$DexValueMethod -> com.android.tools.r8.graph.DexValue$n:
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod):831:831 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):828:828 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):842:842 -> collectIndexedItems
-    1:1:boolean equals(java.lang.Object):828:828 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():828:828 -> f
-    1:1:int hashCode():828:828 -> hashCode
-    1:1:java.lang.Object getBoxedValue():828:828 -> i
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod):861:861 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):858:858 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):872:872 -> collectIndexedItems
+    1:1:boolean equals(java.lang.Object):858:858 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():858:858 -> f
+    1:1:int hashCode():858:858 -> hashCode
+    1:1:java.lang.Object getBoxedValue():858:858 -> i
     void sort() -> k
     byte getValueKind() -> l
-    1:1:java.lang.String toString():828:828 -> toString
+    1:1:java.lang.String toString():858:858 -> toString
 com.android.tools.r8.graph.DexValue$DexValueMethodHandle -> com.android.tools.r8.graph.DexValue$o:
-    1:1:void <init>(com.android.tools.r8.graph.DexMethodHandle):1129:1129 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1126:1126 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):1145:1145 -> collectIndexedItems
-    1:1:boolean equals(java.lang.Object):1126:1126 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():1126:1126 -> f
+    1:1:void <init>(com.android.tools.r8.graph.DexMethodHandle):1158:1158 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1155:1155 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):1174:1174 -> collectIndexedItems
+    1:1:boolean equals(java.lang.Object):1155:1155 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():1155:1155 -> f
     com.android.tools.r8.graph.DexValue$DexValueMethodHandle asDexValueMethodHandle() -> g
-    1:1:int hashCode():1126:1126 -> hashCode
-    1:1:java.lang.Object getBoxedValue():1126:1126 -> i
+    1:1:int hashCode():1155:1155 -> hashCode
+    1:1:java.lang.Object getBoxedValue():1155:1155 -> i
     void sort() -> k
     byte getValueKind() -> l
-    1:1:java.lang.String toString():1126:1126 -> toString
+    1:1:java.lang.String toString():1155:1155 -> toString
 com.android.tools.r8.graph.DexValue$DexValueMethodType -> com.android.tools.r8.graph.DexValue$p:
-    1:1:void <init>(com.android.tools.r8.graph.DexProto):867:867 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):864:864 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):883:883 -> collectIndexedItems
-    1:1:boolean equals(java.lang.Object):864:864 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():864:864 -> f
+    1:1:void <init>(com.android.tools.r8.graph.DexProto):897:897 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):894:894 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):913:913 -> collectIndexedItems
+    1:1:boolean equals(java.lang.Object):894:894 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():894:894 -> f
     com.android.tools.r8.graph.DexValue$DexValueMethodType asDexValueMethodType() -> h
-    1:1:int hashCode():864:864 -> hashCode
-    1:1:java.lang.Object getBoxedValue():864:864 -> i
+    1:1:int hashCode():894:894 -> hashCode
+    1:1:java.lang.Object getBoxedValue():894:894 -> i
     void sort() -> k
     byte getValueKind() -> l
-    1:1:java.lang.String toString():864:864 -> toString
+    1:1:java.lang.String toString():894:894 -> toString
 com.android.tools.r8.graph.DexValue$DexValueNull -> com.android.tools.r8.graph.DexValue$q:
     com.android.tools.r8.graph.DexValue NULL -> c
-    1:1:void <clinit>():1014:1014 -> <clinit>
-    1:1:void <init>():1017:1017 -> <init>
-    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    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):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):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
+    1:1:void <clinit>():1044:1044 -> <clinit>
+    1:1:void <init>():1047:1047 -> <init>
+    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    1:1:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1056 -> a
+    2:3:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1055:1056 -> a
+    2:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1090 -> a
+    4:4:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1055:1055 -> a
+    4:4:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1090 -> a
+    1:1:boolean equals(java.lang.Object):1079:1079 -> equals
     java.lang.Object asAsmEncodedObject() -> f
     java.lang.Object getBoxedValue() -> i
     boolean mayHaveSideEffects() -> j
@@ -18584,91 +18632,91 @@
 com.android.tools.r8.graph.DexValue$DexValueShort -> com.android.tools.r8.graph.DexValue$r:
     com.android.tools.r8.graph.DexValue$DexValueShort DEFAULT -> d
     short value -> c
-    1:1:void <clinit>():311:311 -> <clinit>
-    1:2:void <init>(short):314:315 -> <init>
-    1:1:com.android.tools.r8.graph.DexValue$DexValueShort create(short):319:319 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):333:333 -> a
-    3:3: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):361:361 -> a
-    1:1:boolean equals(java.lang.Object):351:351 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():338:338 -> f
-    1:1:short getValue():323:323 -> getValue
-    1:1:int hashCode():343:343 -> hashCode
-    1:1:java.lang.Object getBoxedValue():328:328 -> i
+    1:1:void <clinit>():316:316 -> <clinit>
+    1:2:void <init>(short):319:320 -> <init>
+    1:1:com.android.tools.r8.graph.DexValue$DexValueShort create(short):324:324 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):338:338 -> a
+    3:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):367:367 -> a
+    1:1:boolean equals(java.lang.Object):356:356 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():343:343 -> f
+    1:1:short getValue():328:328 -> getValue
+    1:1:int hashCode():348:348 -> hashCode
+    1:1:java.lang.Object getBoxedValue():333:333 -> i
     boolean mayHaveSideEffects() -> j
     void sort() -> k
-    1:1:java.lang.String toString():356:356 -> toString
+    1:1:java.lang.String toString():361:361 -> toString
 com.android.tools.r8.graph.DexValue$DexValueString -> com.android.tools.r8.graph.DexValue$s:
-    1:1:void <init>(com.android.tools.r8.graph.DexString):722:722 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):719:719 -> a
-    2:4: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):737:739 -> a
-    1:1:void com.android.tools.r8.graph.DexValue$NestedDexValue.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):688:688 -> collectIndexedItems
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):719 -> collectIndexedItems
-    1:1:boolean equals(java.lang.Object):719:719 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():727:727 -> f
-    1:1:int hashCode():719:719 -> hashCode
-    1:1:java.lang.Object getBoxedValue():719:719 -> i
+    1:1:void <init>(com.android.tools.r8.graph.DexString):743:743 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):740:740 -> a
+    2:6:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):759:763 -> a
+    1:1:void com.android.tools.r8.graph.DexValue$NestedDexValue.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):709:709 -> collectIndexedItems
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):740 -> collectIndexedItems
+    1:1:boolean equals(java.lang.Object):740:740 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():748:748 -> f
+    1:1:int hashCode():740:740 -> hashCode
+    1:1:java.lang.Object getBoxedValue():740:740 -> i
     boolean mayHaveSideEffects() -> j
     void sort() -> k
     byte getValueKind() -> l
-    1:1:java.lang.String toString():719:719 -> toString
+    1:1:java.lang.String toString():740:740 -> toString
 com.android.tools.r8.graph.DexValue$DexValueType -> com.android.tools.r8.graph.DexValue$t:
-    1:1:void <init>(com.android.tools.r8.graph.DexType):795:795 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):792:792 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):806:806 -> collectIndexedItems
-    1:1:boolean equals(java.lang.Object):792:792 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():792:792 -> f
-    1:1:int hashCode():792:792 -> hashCode
-    1:1:java.lang.Object getBoxedValue():792:792 -> i
+    1:1:void <init>(com.android.tools.r8.graph.DexType):825:825 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):822:822 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):836:836 -> collectIndexedItems
+    1:1:boolean equals(java.lang.Object):822:822 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():822:822 -> f
+    1:1:int hashCode():822:822 -> hashCode
+    1:1:java.lang.Object getBoxedValue():822:822 -> i
     void sort() -> k
     byte getValueKind() -> l
-    1:1:java.lang.String toString():792:792 -> toString
+    1:1:java.lang.String toString():822:822 -> toString
 com.android.tools.r8.graph.DexValue$NestedDexValue -> com.android.tools.r8.graph.DexValue$NestedDexValue:
-    1:1:void <init>(com.android.tools.r8.graph.IndexedDexItem,com.android.tools.r8.graph.DexValue$1):651:651 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.IndexedDexItem):655:656 -> <init>
-    1:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):667:668 -> a
+    1:1:void <init>(com.android.tools.r8.graph.IndexedDexItem,com.android.tools.r8.graph.DexValue$1):672:672 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.IndexedDexItem):676:677 -> <init>
+    1:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):688:689 -> a
     3:3:int com.android.tools.r8.dex.DexOutputBuffer.putUnsignedEncodedValue(long,int):92:92 -> a
-    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):669 -> a
+    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):690 -> a
     4:4:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):670 -> a
-    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):671:671 -> a
-    6:6:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    6:6:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):25 -> a
-    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):671 -> a
-    7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):672:672 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):688:688 -> collectIndexedItems
-    1:3:boolean equals(java.lang.Object):706:708 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():682:682 -> f
-    1:1:com.android.tools.r8.graph.IndexedDexItem getValue():662:662 -> getValue
-    1:1:int hashCode():698:698 -> hashCode
-    1:1:java.lang.Object getBoxedValue():677:677 -> i
+    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):691 -> a
+    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):692:692 -> a
+    6:6:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    6:6:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):692 -> a
+    7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):693:693 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):709:709 -> collectIndexedItems
+    1:3:boolean equals(java.lang.Object):727:729 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():703:703 -> f
+    1:1:com.android.tools.r8.graph.IndexedDexItem getValue():683:683 -> getValue
+    1:1:int hashCode():719:719 -> hashCode
+    1:1:java.lang.Object getBoxedValue():698:698 -> i
     void sort() -> k
     byte getValueKind() -> l
-    1:1:java.lang.String toString():715:715 -> toString
+    1:1:java.lang.String toString():736:736 -> toString
 com.android.tools.r8.graph.DexValue$SimpleDexValue -> com.android.tools.r8.graph.DexValue$u:
-    1:1:void <init>():222:222 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexValue$1):222:222 -> <init>
-    1:1:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):243:243 -> a
+    1:1:void <init>():226:226 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexValue$1):226:226 -> <init>
+    1:1:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):247:247 -> a
     2:2:int com.android.tools.r8.dex.DexOutputBuffer.putSignedEncodedValue(long,int):88:88 -> a
-    2:2:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):244 -> a
+    2:2:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):248 -> a
     3:3:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    3:3:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):245 -> a
-    4:4:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):92:92 -> a
-    4:4:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):25 -> a
-    4:4:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):246 -> a
-    5:5:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):247:247 -> a
+    3:3:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):249 -> a
+    4:4:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
+    4:4:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
+    4:4:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):250 -> a
+    5:5:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):251:251 -> a
 com.android.tools.r8.graph.DexValue$UnknownDexValue -> com.android.tools.r8.graph.DexValue$v:
     com.android.tools.r8.graph.DexValue$UnknownDexValue UNKNOWN -> c
-    1:1:void <clinit>():165:165 -> <clinit>
-    1:1:void <init>():167:167 -> <init>
-    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) -> a
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):188:188 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):173:173 -> collectIndexedItems
-    1:1:java.lang.Object asAsmEncodedObject():198:198 -> f
-    1:1:int hashCode():203:203 -> hashCode
-    1:1:java.lang.Object getBoxedValue():193:193 -> i
+    1:1:void <clinit>():168:168 -> <clinit>
+    1:1:void <init>():170:170 -> <init>
+    com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo) -> a
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):191:191 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):176:176 -> collectIndexedItems
+    1:1:java.lang.Object asAsmEncodedObject():201:201 -> f
+    1:1:int hashCode():206:206 -> hashCode
+    1:1:java.lang.Object getBoxedValue():196:196 -> i
     boolean mayHaveSideEffects() -> j
-    1:1:void sort():178:178 -> k
-com.android.tools.r8.graph.DirectMappedDexApplication -> com.android.tools.r8.graph.g0:
+    1:1:void sort():181:181 -> k
+com.android.tools.r8.graph.DirectMappedDexApplication -> com.android.tools.r8.graph.h0:
     com.android.tools.r8.com.google.common.collect.ImmutableList libraryClasses -> n
     com.android.tools.r8.com.google.common.collect.ImmutableList classpathClasses -> m
     boolean $assertionsDisabled -> o
@@ -18699,8 +18747,8 @@
     1:1:java.util.Collection allClasses():63:63 -> h
     1:1:java.util.Collection libraryClasses():72:72 -> i
     1:12:boolean verifyCodeObjectsOwners():144:155 -> j
-com.android.tools.r8.graph.DirectMappedDexApplication$1 -> com.android.tools.r8.graph.g0$a:
-com.android.tools.r8.graph.DirectMappedDexApplication$Builder -> com.android.tools.r8.graph.g0$b:
+com.android.tools.r8.graph.DirectMappedDexApplication$1 -> com.android.tools.r8.graph.h0$a:
+com.android.tools.r8.graph.DirectMappedDexApplication$Builder -> com.android.tools.r8.graph.h0$b:
     com.android.tools.r8.com.google.common.collect.ImmutableList classpathClasses -> m
     com.android.tools.r8.com.google.common.collect.ImmutableList libraryClasses -> l
     1:1:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DirectMappedDexApplication$1):161:161 -> <init>
@@ -18708,7 +18756,7 @@
     8:10:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication):176:178 -> <init>
     1:16:com.android.tools.r8.graph.DexApplication build():190:205 -> a
     com.android.tools.r8.graph.DexApplication$Builder self() -> e
-com.android.tools.r8.graph.EnclosingMethodAttribute -> com.android.tools.r8.graph.h0:
+com.android.tools.r8.graph.EnclosingMethodAttribute -> com.android.tools.r8.graph.i0:
     com.android.tools.r8.graph.DexType enclosingClass -> a
     com.android.tools.r8.graph.DexMethod enclosingMethod -> b
     boolean $assertionsDisabled -> c
@@ -18723,7 +18771,7 @@
     1:1:boolean equals(java.lang.Object):62:62 -> equals
     1:2:int hashCode():56:57 -> hashCode
     1:4:java.lang.String toString():78:81 -> toString
-com.android.tools.r8.graph.FieldAccessFlags -> com.android.tools.r8.graph.i0:
+com.android.tools.r8.graph.FieldAccessFlags -> com.android.tools.r8.graph.j0:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(int,int):44:44 -> <init>
@@ -18745,9 +18793,9 @@
     1:2:com.android.tools.r8.graph.FieldAccessFlags fromSharedAccessFlags(int):58:59 -> g
     3:3:void <init>(int):40:40 -> g
     3:3:com.android.tools.r8.graph.FieldAccessFlags fromSharedAccessFlags(int):59 -> g
-com.android.tools.r8.graph.FieldAccessInfo -> com.android.tools.r8.graph.j0:
-com.android.tools.r8.graph.FieldAccessInfoCollection -> com.android.tools.r8.graph.k0:
-com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8.graph.l0:
+com.android.tools.r8.graph.FieldAccessInfo -> com.android.tools.r8.graph.k0:
+com.android.tools.r8.graph.FieldAccessInfoCollection -> com.android.tools.r8.graph.l0:
+com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8.graph.m0:
     java.util.Map infos -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():13:13 -> <clinit>
@@ -18762,7 +18810,7 @@
     9:10:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl rewrittenWithLens(com.android.tools.r8.graph.GraphLense):40:41 -> a
     11:11:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):43:43 -> a
     12:12:boolean verifyMappingIsOneToOne():50:50 -> a
-com.android.tools.r8.graph.FieldAccessInfoImpl -> com.android.tools.r8.graph.m0:
+com.android.tools.r8.graph.FieldAccessInfoImpl -> com.android.tools.r8.graph.n0:
     java.util.Map readsWithContexts -> b
     java.util.Map writesWithContexts -> c
     com.android.tools.r8.graph.FieldAccessInfoImpl MISSING_FIELD_ACCESS_INFO -> d
@@ -18777,25 +18825,26 @@
     15:15:void extendAccessesWithContexts(java.util.Map,java.util.function.Predicate,java.util.Map):101:101 -> a
     16:19:void lambda$extendAccessesWithContexts$6(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.DexField,java.util.Set):103:106 -> a
     20:20:java.util.Set lambda$extendAccessesWithContexts$5(com.android.tools.r8.graph.DexField):105:105 -> a
-    21:26:boolean recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):150:155 -> a
-    27:27:void clearWrites():172:172 -> a
-    28:40:com.android.tools.r8.graph.FieldAccessInfoImpl rewrittenWithLens(com.android.tools.r8.graph.GraphLense):176:188 -> a
-    41:42:void lambda$rewrittenWithLens$10(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexField,java.util.Set):183:184 -> a
+    21:23:boolean isWrittenOutside(com.android.tools.r8.graph.DexEncodedMethod):154:156 -> a
+    24:29:boolean recordRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):167:172 -> a
+    30:30:void clearWrites():189:189 -> a
+    31:43:com.android.tools.r8.graph.FieldAccessInfoImpl rewrittenWithLens(com.android.tools.r8.graph.GraphLense):193:205 -> a
+    44:45:void lambda$rewrittenWithLens$10(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexField,java.util.Set):200:201 -> a
     1:1:com.android.tools.r8.graph.DexField getField():46:46 -> b
     2:2:boolean lambda$forEachIndirectAccess$1(java.util.Set,com.android.tools.r8.graph.DexField):68:68 -> b
     3:3:boolean lambda$forEachIndirectAccessWithContexts$3(com.android.tools.r8.graph.DexField):90:90 -> b
     4:10:void forEachReadContext(java.util.function.Consumer):116:122 -> b
-    11:16:boolean recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):159:164 -> b
-    17:18:void lambda$rewrittenWithLens$12(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexField,java.util.Set):192:193 -> b
+    11:16:boolean recordWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):176:181 -> b
+    17:18:void lambda$rewrittenWithLens$12(com.android.tools.r8.graph.FieldAccessInfoImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexField,java.util.Set):209:210 -> b
     1:4:com.android.tools.r8.graph.DexEncodedMethod getUniqueReadContext():51:54 -> c
     5:5:boolean lambda$forEachIndirectAccessWithContexts$4(com.android.tools.r8.graph.DexField):92:92 -> c
     1:1:boolean isRead():132:132 -> d
-    2:2:java.util.Set lambda$recordRead$7(com.android.tools.r8.graph.DexField):154:154 -> d
+    2:2:java.util.Set lambda$recordRead$7(com.android.tools.r8.graph.DexField):171:171 -> d
     1:1:boolean isWritten():146:146 -> e
-    2:2:java.util.Set lambda$recordWrite$8(com.android.tools.r8.graph.DexField):163:163 -> e
-    1:1:java.util.Set lambda$rewrittenWithLens$11(com.android.tools.r8.graph.DexField):192:192 -> f
-    1:1:java.util.Set lambda$rewrittenWithLens$9(com.android.tools.r8.graph.DexField):183:183 -> g
-com.android.tools.r8.graph.GraphLense -> com.android.tools.r8.graph.n0:
+    2:2:java.util.Set lambda$recordWrite$8(com.android.tools.r8.graph.DexField):180:180 -> e
+    1:1:java.util.Set lambda$rewrittenWithLens$11(com.android.tools.r8.graph.DexField):209:209 -> f
+    1:1:java.util.Set lambda$rewrittenWithLens$9(com.android.tools.r8.graph.DexField):200:200 -> g
+com.android.tools.r8.graph.GraphLense -> com.android.tools.r8.graph.o0:
     1:1:void <clinit>():50:50 -> <clinit>
     1:1:void <init>():50:50 -> <init>
     1:1:com.android.tools.r8.graph.GraphLense$Builder builder():408:408 -> a
@@ -18822,8 +18871,8 @@
     32:52:boolean verifyIsBridgeMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexApplication,java.util.Set,com.android.tools.r8.graph.DexItemFactory):744:764 -> verifyMappingToOriginalProgram
     32:52:boolean verifyMappingToOriginalProgram(java.lang.Iterable,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexItemFactory):726 -> verifyMappingToOriginalProgram
     53:57:boolean verifyMappingToOriginalProgram(java.lang.Iterable,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexItemFactory):725:729 -> verifyMappingToOriginalProgram
-com.android.tools.r8.graph.GraphLense$1 -> com.android.tools.r8.graph.n0$a:
-com.android.tools.r8.graph.GraphLense$Builder -> com.android.tools.r8.graph.n0$b:
+com.android.tools.r8.graph.GraphLense$1 -> com.android.tools.r8.graph.o0$a:
+com.android.tools.r8.graph.GraphLense$Builder -> com.android.tools.r8.graph.o0$b:
     java.util.Map typeMap -> a
     java.util.Map methodMap -> b
     java.util.Map fieldMap -> c
@@ -18836,13 +18885,13 @@
     1:1:void map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):362:362 -> b
     1:1:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):376 -> b
     2:2:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):377:377 -> b
-com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult -> com.android.tools.r8.graph.n0$c:
+com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult -> com.android.tools.r8.graph.o0$c:
     com.android.tools.r8.ir.code.Invoke$Type type -> b
     com.android.tools.r8.graph.DexMethod method -> a
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):62:64 -> <init>
     1:1:com.android.tools.r8.graph.DexMethod getMethod():68:68 -> a
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():72:72 -> b
-com.android.tools.r8.graph.GraphLense$IdentityGraphLense -> com.android.tools.r8.graph.n0$d:
+com.android.tools.r8.graph.GraphLense$IdentityGraphLense -> com.android.tools.r8.graph.o0$d:
     com.android.tools.r8.graph.GraphLense$IdentityGraphLense INSTANCE -> a
     1:1:void <clinit>():772:772 -> <clinit>
     1:1:void <init>():774:774 -> <init>
@@ -18850,7 +18899,7 @@
     1:1:com.android.tools.r8.graph.GraphLense$IdentityGraphLense access$100():770 -> c
     1:1:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):812:812 -> lookupMethod
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):817:817 -> lookupPrototypeChanges
-com.android.tools.r8.graph.GraphLense$NestedGraphLense -> com.android.tools.r8.graph.n0$e:
+com.android.tools.r8.graph.GraphLense$NestedGraphLense -> com.android.tools.r8.graph.o0$e:
     1:1:void <clinit>():841:841 -> <clinit>
     1:1:void <init>(java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory):869:869 -> <init>
     2:26:void <init>(java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory):847:871 -> <init>
@@ -18877,7 +18926,7 @@
     17:17:com.android.tools.r8.ir.code.Invoke$Type mapVirtualInterfaceInvocationTypes(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1008 -> mapVirtualInterfaceInvocationTypes
     18:18:com.android.tools.r8.ir.code.Invoke$Type mapVirtualInterfaceInvocationTypes(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1008:1008 -> mapVirtualInterfaceInvocationTypes
     1:17:java.lang.String toString():1040:1056 -> toString
-com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription -> com.android.tools.r8.graph.n0$f:
+com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription -> com.android.tools.r8.graph.o0$f:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription none -> d
     boolean hasBeenChangedToReturnVoid -> a
@@ -18900,7 +18949,7 @@
     1:2:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription withConstantReturn():322:323 -> e
     1:2:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription withExtraNullParameter():333:334 -> f
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription none():257:257 -> g
-com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo -> com.android.tools.r8.graph.n0$f$a:
+com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo -> com.android.tools.r8.graph.o0$f$a:
     com.android.tools.r8.graph.DexType type -> c
     boolean isAlwaysNull -> b
     int argumentIndex -> a
@@ -18911,7 +18960,7 @@
     1:1:com.android.tools.r8.graph.DexType getType():127:127 -> b
     1:1:boolean isAlwaysNull():131:131 -> c
     1:1:boolean isNeverUsed():135:135 -> d
-com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder -> com.android.tools.r8.graph.o0:
+com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder -> com.android.tools.r8.graph.p0:
     com.android.tools.r8.graph.DexType type -> c
     boolean isAlwaysNull -> b
     boolean $assertionsDisabled -> d
@@ -18922,7 +18971,7 @@
     2:2:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setType(com.android.tools.r8.graph.DexType):97:97 -> a
     3:5:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo build():102:104 -> a
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setIsAlwaysNull():92:92 -> b
-com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo -> com.android.tools.r8.graph.n0$f$b:
+com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo -> com.android.tools.r8.graph.o0$f$b:
     java.util.List removedArguments -> a
     com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo empty -> b
     boolean $assertionsDisabled -> c
@@ -18938,7 +18987,7 @@
     1:3:java.util.ListIterator iterator():174:176 -> b
     1:1:int numberOfRemovedArguments():195:195 -> c
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo empty():170:170 -> d
-com.android.tools.r8.graph.IndexedDexItem -> com.android.tools.r8.graph.p0:
+com.android.tools.r8.graph.IndexedDexItem -> com.android.tools.r8.graph.q0:
     boolean $assertionsDisabled -> b
     int sortedIndex -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -18952,7 +19001,7 @@
     2:2:void resetSortedIndex():58:58 -> flushCachedValues
     2:2:void flushCachedValues():54 -> flushCachedValues
     1:1:void resetSortedIndex():58:58 -> g
-com.android.tools.r8.graph.InnerClassAttribute -> com.android.tools.r8.graph.q0:
+com.android.tools.r8.graph.InnerClassAttribute -> com.android.tools.r8.graph.r0:
     com.android.tools.r8.graph.DexString innerName -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType outer -> c
@@ -18976,7 +19025,7 @@
     1:1:boolean isAnonymous():46:46 -> e
     1:1:boolean isNamed():42:42 -> f
     1:4:java.lang.String toString():108:111 -> toString
-com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.graph.r0:
+com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.graph.s0:
     java.util.concurrent.ConcurrentHashMap stringCache -> d
     com.android.tools.r8.utils.InternalOptions options -> a
     java.util.concurrent.ConcurrentHashMap asmTypeCache -> c
@@ -19024,7 +19073,7 @@
     1:4:java.lang.String getShortyDescriptor(java.lang.String):130:133 -> h
     1:1:com.android.tools.r8.org.objectweb.asm.Type lambda$getAsmObjectType$0(java.lang.String):32:32 -> i
     1:1:com.android.tools.r8.org.objectweb.asm.Type lambda$getAsmType$1(java.lang.String):36:36 -> j
-com.android.tools.r8.graph.JarClassFileReader -> com.android.tools.r8.graph.s0:
+com.android.tools.r8.graph.JarClassFileReader -> com.android.tools.r8.graph.t0:
     com.android.tools.r8.dex.ClassesChecksum checksums -> c
     java.util.function.Consumer classConsumer -> b
     boolean $assertionsDisabled -> e
@@ -19075,7 +19124,7 @@
     7:8:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):184:185 -> b
     9:15:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):184:190 -> b
     1:1:com.android.tools.r8.graph.FieldAccessFlags createFieldAccessFlags(int):149:149 -> c
-com.android.tools.r8.graph.JarClassFileReader$CreateAnnotationVisitor -> com.android.tools.r8.graph.s0$a:
+com.android.tools.r8.graph.JarClassFileReader$CreateAnnotationVisitor -> com.android.tools.r8.graph.t0$a:
     java.util.List values -> d
     java.util.List names -> c
     boolean $assertionsDisabled -> e
@@ -19101,7 +19150,7 @@
     96:96:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):987:987 -> a
     96:96:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1015 -> a
     96:96:void visit(java.lang.String,java.lang.Object):890 -> a
-com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor -> com.android.tools.r8.graph.s0$b:
+com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor -> com.android.tools.r8.graph.t0$b:
     com.android.tools.r8.graph.ClassKind classKind -> d
     java.util.List annotations -> r
     java.util.Set methodSignatures -> y
@@ -19252,7 +19301,7 @@
     1:1:java.util.List access$700(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):193:193 -> j
     1:1:com.android.tools.r8.graph.ClassKind access$800(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):193:193 -> k
     1:1:com.android.tools.r8.origin.Origin access$900(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):193:193 -> l
-com.android.tools.r8.graph.JarClassFileReader$CreateFieldVisitor -> com.android.tools.r8.graph.s0$c:
+com.android.tools.r8.graph.JarClassFileReader$CreateFieldVisitor -> com.android.tools.r8.graph.t0$c:
     com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor parent -> b
     java.lang.Object value -> f
     boolean $assertionsDisabled -> h
@@ -19281,7 +19330,7 @@
     56:59:java.util.List getAnnotations():658:661 -> a
     56:59:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):584 -> a
     60:60:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):584:584 -> a
-com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> com.android.tools.r8.graph.s0$d:
+com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> com.android.tools.r8.graph.t0$d:
     java.util.List parameterFlags -> r
     int annotableParameterCount -> o
     java.util.List parameterNames -> q
@@ -19319,8 +19368,8 @@
     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():330:330 -> c
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1048 -> c
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> c
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1050 -> c
     6:6:boolean classRequiresCode():790 -> c
     6:6:void visitEnd():798 -> c
     7:9:boolean classRequiresCode():790:792 -> c
@@ -19350,17 +19399,17 @@
     83:83:void visitEnd():841:841 -> c
     84:92:void visitEnd():839:847 -> c
     1:4:java.util.List getAnnotations():863:866 -> d
-com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> com.android.tools.r8.graph.s0$e:
+com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> com.android.tools.r8.graph.t0$e:
     com.android.tools.r8.graph.DexClass owner -> b
     byte[] classCache -> a
     java.util.List codeList -> c
     1:8:void <init>():1019:1026 -> <init>
-com.android.tools.r8.graph.KeyedDexItem -> com.android.tools.r8.graph.t0:
+com.android.tools.r8.graph.KeyedDexItem -> com.android.tools.r8.graph.u0:
     1:1:void <init>():6:6 -> <init>
     1:1:boolean equals(java.lang.Object):15:15 -> equals
     1:1:int hashCode():20:20 -> hashCode
     com.android.tools.r8.graph.PresortedComparable getKey() -> n
-com.android.tools.r8.graph.LazyCfCode -> com.android.tools.r8.graph.z0:
+com.android.tools.r8.graph.LazyCfCode -> com.android.tools.r8.graph.A0:
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> c
     com.android.tools.r8.graph.CfCode code -> b
     boolean $assertionsDisabled -> e
@@ -19398,15 +19447,15 @@
     1:1:void registerCodeReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry):204:204 -> registerCodeReferences
     1:1:java.lang.String toString():214:214 -> toString
     2:2:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):219:219 -> toString
-com.android.tools.r8.graph.LazyCfCode$1 -> com.android.tools.r8.graph.u0:
-com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> com.android.tools.r8.graph.v0:
+com.android.tools.r8.graph.LazyCfCode$1 -> com.android.tools.r8.graph.v0:
+com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> com.android.tools.r8.graph.w0:
     java.util.function.BiFunction codeLocator -> d
     com.android.tools.r8.graph.JarApplicationReader application -> e
     boolean usrJsrInliner -> f
     com.android.tools.r8.graph.DexClass clazz -> c
     1:5:void <init>(com.android.tools.r8.graph.DexClass,java.util.function.BiFunction,com.android.tools.r8.graph.JarApplicationReader,boolean):254:258 -> <init>
     1:10:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):264:273 -> a
-com.android.tools.r8.graph.LazyCfCode$DefaultCodeLocator -> com.android.tools.r8.graph.w0:
+com.android.tools.r8.graph.LazyCfCode$DefaultCodeLocator -> com.android.tools.r8.graph.x0:
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> a
     int methodIndex -> b
     1:1:void <init>(com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.LazyCfCode$1):226:226 -> <init>
@@ -19415,9 +19464,9 @@
     1:1:java.lang.Object apply(java.lang.Object,java.lang.Object):226:226 -> apply
     2:2:com.android.tools.r8.graph.LazyCfCode apply(java.lang.String,java.lang.String):238:238 -> apply
     2:2:java.lang.Object apply(java.lang.Object,java.lang.Object):226 -> apply
-com.android.tools.r8.graph.LazyCfCode$JsrEncountered -> com.android.tools.r8.graph.x0:
+com.android.tools.r8.graph.LazyCfCode$JsrEncountered -> com.android.tools.r8.graph.y0:
     1:1:void <init>(java.lang.String):87:87 -> <init>
-com.android.tools.r8.graph.LazyCfCode$MethodCodeVisitor -> com.android.tools.r8.graph.y0:
+com.android.tools.r8.graph.LazyCfCode$MethodCodeVisitor -> com.android.tools.r8.graph.z0:
     java.util.Map canonicalDebugLocalInfo -> q
     java.util.Map labelMap -> r
     int maxStack -> l
@@ -19561,7 +19610,7 @@
     4:8:void visitVarInsn(int,int):637:641 -> d
     9:35:void visitVarInsn(int,int):633:659 -> d
     36:36:void visitVarInsn(int,int):652:652 -> d
-com.android.tools.r8.graph.LazyLoadedDexApplication -> com.android.tools.r8.graph.A0:
+com.android.tools.r8.graph.LazyLoadedDexApplication -> com.android.tools.r8.graph.B0:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.utils.LibraryClassCollection libraryClasses -> l
     com.android.tools.r8.utils.ProgramClassCollection programClasses -> j
@@ -19583,8 +19632,8 @@
     1:1:com.android.tools.r8.graph.DirectMappedDexApplication toDirect():253:253 -> g
     1:1:com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses loadAllClasses():191:191 -> h
     1:1:java.lang.String toString():258:258 -> toString
-com.android.tools.r8.graph.LazyLoadedDexApplication$1 -> com.android.tools.r8.graph.A0$a:
-com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses -> com.android.tools.r8.graph.A0$b:
+com.android.tools.r8.graph.LazyLoadedDexApplication$1 -> com.android.tools.r8.graph.B0$a:
+com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses -> com.android.tools.r8.graph.B0$b:
     com.android.tools.r8.com.google.common.collect.ImmutableList classpathClasses -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList programClasses -> a
     boolean $assertionsDisabled -> d
@@ -19598,7 +19647,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList getLibraryClasses():166:166 -> b
     boolean lambda$new$2(com.android.tools.r8.graph.DexType) -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList getProgramClasses():158:158 -> c
-com.android.tools.r8.graph.LazyLoadedDexApplication$Builder -> com.android.tools.r8.graph.A0$c:
+com.android.tools.r8.graph.LazyLoadedDexApplication$Builder -> com.android.tools.r8.graph.B0$c:
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver resolver -> n
     com.android.tools.r8.utils.LibraryClassCollection libraryClasses -> m
     com.android.tools.r8.utils.ClasspathClassCollection classpathClasses -> l
@@ -19610,7 +19659,7 @@
     3:3:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder setLibraryClassCollection(com.android.tools.r8.utils.LibraryClassCollection):226:226 -> a
     4:10:com.android.tools.r8.graph.LazyLoadedDexApplication build():232:238 -> a
     com.android.tools.r8.graph.DexApplication$Builder self() -> e
-com.android.tools.r8.graph.MethodAccessFlags -> com.android.tools.r8.graph.B0:
+com.android.tools.r8.graph.MethodAccessFlags -> com.android.tools.r8.graph.C0:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(int,int):61:61 -> <init>
@@ -19659,21 +19708,21 @@
     4:4:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):88 -> e
     5:5:void unsetDeclaredSynchronized():192:192 -> e
     5:5:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):89 -> e
-com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.graph.C0:
+com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.graph.D0:
     com.android.tools.r8.graph.DexType nestHost -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():10:10 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexType):14:15 -> <init>
     1:1:com.android.tools.r8.graph.DexType getNestHost():19:19 -> a
     2:3:void write(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.naming.NamingLens):23:24 -> a
-com.android.tools.r8.graph.NestMemberClassAttribute -> com.android.tools.r8.graph.D0:
+com.android.tools.r8.graph.NestMemberClassAttribute -> com.android.tools.r8.graph.E0:
     com.android.tools.r8.graph.DexType nestMember -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():10:10 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexType):14:15 -> <init>
     1:1:com.android.tools.r8.graph.DexType getNestMember():19:19 -> a
     2:3:void write(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.naming.NamingLens):23:24 -> a
-com.android.tools.r8.graph.ObjectToOffsetMapping -> com.android.tools.r8.graph.E0:
+com.android.tools.r8.graph.ObjectToOffsetMapping -> com.android.tools.r8.graph.F0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap types -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap methods -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap fields -> e
@@ -19719,13 +19768,13 @@
     1:1:java.util.Collection getStrings():179:179 -> i
     1:1:java.util.Collection getTypes():167:167 -> j
     1:1:boolean hasJumboStrings():191:191 -> k
-com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> com.android.tools.r8.graph.E0$a:
+com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> com.android.tools.r8.graph.F0$a:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap depthOfClasses -> b
     1:1:void <init>(com.android.tools.r8.graph.DexApplication):103:103 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.DexApplication):101:105 -> <init>
     1:22:int getDepth(com.android.tools.r8.graph.DexProgramClass):109:130 -> a
-com.android.tools.r8.graph.OffsetToObjectMapping -> com.android.tools.r8.graph.F0:
+com.android.tools.r8.graph.OffsetToObjectMapping -> com.android.tools.r8.graph.G0:
     com.android.tools.r8.graph.DexProto[] protos -> c
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexMethodHandle[] methodHandles -> h
@@ -19765,7 +19814,7 @@
     1:2:void initializeProtos(int):28:29 -> l
     1:2:void initializeStrings(int):43:44 -> m
     1:2:void initializeTypes(int):38:39 -> n
-com.android.tools.r8.graph.ParameterAnnotationsList -> com.android.tools.r8.graph.G0:
+com.android.tools.r8.graph.ParameterAnnotationsList -> com.android.tools.r8.graph.H0:
     com.android.tools.r8.graph.ParameterAnnotationsList EMPTY_PARAMETER_ANNOTATIONS_LIST -> c
     com.android.tools.r8.graph.DexAnnotationSet[] values -> a
     int missingParameterAnnotations -> b
@@ -19786,16 +19835,15 @@
     1:1:int size():114:114 -> h
     1:1:int hashCode():69:69 -> hashCode
     1:1:com.android.tools.r8.graph.ParameterAnnotationsList empty():45:45 -> i
-com.android.tools.r8.graph.Presorted -> com.android.tools.r8.graph.H0:
+com.android.tools.r8.graph.Presorted -> com.android.tools.r8.graph.I0:
     void setSortedIndex(int) -> b
-com.android.tools.r8.graph.PresortedComparable -> com.android.tools.r8.graph.I0:
+com.android.tools.r8.graph.PresortedComparable -> com.android.tools.r8.graph.J0:
     int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens) -> a
     int slowCompareTo(java.lang.Object) -> a
     1:1:boolean isSorted(java.util.List):15:15 -> a
-    2:2:boolean isSorted(java.lang.Object[],java.util.function.Function):19:19 -> a
-    3:5:boolean isSorted(java.util.List,java.util.function.Function):25:27 -> a
-    6:6:int slowCompare(com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):44:44 -> a
-com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.graph.J0:
+    2:4:boolean isSorted(java.util.List,java.util.function.Function):25:27 -> a
+    5:5:int slowCompare(com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):44:44 -> a
+com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.graph.K0:
     com.android.tools.r8.graph.DexApplication application -> a
     java.util.Set visited -> b
     1:1:void <init>(com.android.tools.r8.graph.DexApplication):32:32 -> <init>
@@ -19808,7 +19856,7 @@
     16:17:void accept(com.android.tools.r8.graph.DexTypeList):50:51 -> b
     16:17:void accept(com.android.tools.r8.graph.DexClass):60 -> b
     18:19:void accept(com.android.tools.r8.graph.DexClass):61:62 -> b
-com.android.tools.r8.graph.ResolutionResult -> com.android.tools.r8.graph.K0:
+com.android.tools.r8.graph.ResolutionResult -> com.android.tools.r8.graph.L0:
     1:1:void <clinit>():14:14 -> <clinit>
     void forEachTarget(java.util.function.Consumer) -> a
     boolean hasSingleTarget() -> a
@@ -19823,20 +19871,20 @@
     1:2:void lambda$lookupInterfaceTargets$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):96:97 -> c
     boolean isValidVirtualTargetForDynamicDispatch() -> d
     java.util.List asListOfTargets() -> e
-com.android.tools.r8.graph.ResolutionResult$1 -> com.android.tools.r8.graph.K0$a:
+com.android.tools.r8.graph.ResolutionResult$1 -> com.android.tools.r8.graph.L0$a:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():37:37 -> <clinit>
-com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult -> com.android.tools.r8.graph.K0$b:
+com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult -> com.android.tools.r8.graph.L0$b:
     com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult INSTANCE -> a
     1:1:void <clinit>():223:223 -> <clinit>
     1:1:void <init>():225:225 -> <init>
     boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions) -> a
     boolean isValidVirtualTargetForDynamicDispatch() -> d
-com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult -> com.android.tools.r8.graph.K0$c:
+com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult -> com.android.tools.r8.graph.L0$c:
     com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult INSTANCE -> a
     1:1:void <clinit>():254:254 -> <clinit>
     1:1:void <init>():256:256 -> <init>
-com.android.tools.r8.graph.ResolutionResult$EmptyResult -> com.android.tools.r8.graph.K0$d:
+com.android.tools.r8.graph.ResolutionResult$EmptyResult -> com.android.tools.r8.graph.L0$d:
     1:1:void <init>():183:183 -> <init>
     void forEachTarget(java.util.function.Consumer) -> a
     boolean hasSingleTarget() -> a
@@ -19845,15 +19893,15 @@
     java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping) -> b
     com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve() -> c
     1:1:java.util.List asListOfTargets():202:202 -> e
-com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult -> com.android.tools.r8.graph.K0$e:
+com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult -> com.android.tools.r8.graph.L0$e:
     1:1:void <init>():240:240 -> <init>
     boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions) -> a
     boolean isValidVirtualTargetForDynamicDispatch() -> d
-com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult -> com.android.tools.r8.graph.K0$f:
+com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult -> com.android.tools.r8.graph.L0$f:
     com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult INSTANCE -> a
     1:1:void <clinit>():262:262 -> <clinit>
     1:1:void <init>():264:264 -> <init>
-com.android.tools.r8.graph.ResolutionResult$MultiResult -> com.android.tools.r8.graph.K0$g:
+com.android.tools.r8.graph.ResolutionResult$MultiResult -> com.android.tools.r8.graph.L0$g:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList methods -> a
     1:1:void <clinit>():126:126 -> <clinit>
@@ -19865,11 +19913,11 @@
     1:1:com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve():158:158 -> c
     1:2:boolean isValidVirtualTargetForDynamicDispatch():147:148 -> d
     1:1:java.util.List asListOfTargets():174:174 -> e
-com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult -> com.android.tools.r8.graph.K0$h:
+com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult -> com.android.tools.r8.graph.L0$h:
     com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult INSTANCE -> a
     1:1:void <clinit>():270:270 -> <clinit>
     1:1:void <init>():272:272 -> <init>
-com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.graph.L0:
+com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.graph.M0:
     1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):22:22 -> <init>
     java.lang.String getFileEnding() -> a
     void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream) -> a
@@ -19878,7 +19926,7 @@
     20:22:void writeClassFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):66:68 -> a
     23:25:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):73:75 -> a
     1:13:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):47:59 -> b
-com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.graph.M0:
+com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.graph.N0:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):14:14 -> <init>
     com.android.tools.r8.graph.ClassHierarchyTraversal self() -> a
     1:1:void visit(java.lang.Iterable,java.util.function.Consumer):9:9 -> a
@@ -19910,7 +19958,7 @@
     1:1:com.android.tools.r8.graph.TopDownClassHierarchyTraversal forProgramClasses(com.android.tools.r8.graph.AppView):50:50 -> b
     2:3:com.android.tools.r8.graph.ClassHierarchyTraversal com.android.tools.r8.graph.ClassHierarchyTraversal.excludeInterfaces():60:61 -> b
     2:3:com.android.tools.r8.graph.ClassHierarchyTraversal excludeInterfaces():0 -> b
-com.android.tools.r8.graph.UseRegistry -> com.android.tools.r8.graph.N0:
+com.android.tools.r8.graph.UseRegistry -> com.android.tools.r8.graph.O0:
     1:1:void <clinit>():15:15 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexItemFactory):24:25 -> <init>
     1:25:void registerCallSite(com.android.tools.r8.graph.DexCallSite):99:123 -> registerCallSite
@@ -19928,12 +19976,12 @@
     46:46:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):65:65 -> registerMethodHandle
     47:47:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):62:62 -> registerMethodHandle
     1:3:void registerProto(com.android.tools.r8.graph.DexProto):133:135 -> registerProto
-com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> com.android.tools.r8.graph.N0$a:
+com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> com.android.tools.r8.graph.O0$a:
     com.android.tools.r8.graph.UseRegistry$MethodHandleUse ARGUMENT_TO_LAMBDA_METAFACTORY -> a
     com.android.tools.r8.graph.UseRegistry$MethodHandleUse NOT_ARGUMENT_TO_LAMBDA_METAFACTORY -> b
     1:2:void <clinit>():20:21 -> <clinit>
     1:1:void <init>(java.lang.String,int):19:19 -> <init>
-com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.graph.O0.a:
+com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.graph.P0.a:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> b
     java.util.List r8InstructionSequence -> d
     java.util.List javacInstructionSequence -> c
@@ -19952,22 +20000,22 @@
     49:55:boolean hasJavacClinitAssertionCode(com.android.tools.r8.graph.CfCode):98:104 -> a
     49:55:void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod):36 -> a
     56:56:void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod):37:37 -> a
-com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.graph.O0.b:
-    1:1:void <init>():14:14 -> <init>
+com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.graph.P0.b:
+    1:1:void <init>():13:13 -> <init>
     void done() -> a
     void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist) -> a
-    void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason) -> a
+    void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod) -> a
     void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod) -> a
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.graph.O0.d:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.graph.P0.d:
     java.util.Map mapping -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):59:59 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.AppView):56:60 -> <init>
-    1:17:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):65:81 -> a
-    18:18:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):79:79 -> a
+    1:17:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):65:81 -> a
+    18:18:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):79:79 -> a
     19:19:void done():87:87 -> a
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1 -> com.android.tools.r8.graph.O0.c:
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.graph.O0.d$a:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1 -> com.android.tools.r8.graph.P0.c:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.graph.P0.d$a:
     java.util.Map mapping -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1):19:19 -> <init>
@@ -20431,7 +20479,7 @@
     18:18:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):136 -> a
     18:18:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     18:18:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     19:19:void rewriteInfoArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):144 -> a
     19:19:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):136 -> a
     19:19:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -20458,7 +20506,7 @@
     26:33:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):137 -> a
     26:33:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     26:33:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    34:34:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    34:34:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     34:34:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):164 -> a
     34:34:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):137 -> a
     34:34:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -20536,11 +20584,6 @@
     2:2:boolean isDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod):83 -> a
     3:4:boolean isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.DexMethod):87:88 -> a
     1:1:boolean isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):92:92 -> b
-    2:2:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexMethod):152:152 -> b
-    2:2:boolean isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):92 -> b
-    3:3:boolean isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):92:92 -> b
-    4:4:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexMethod):152:152 -> b
-    4:4:boolean isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):92 -> b
 com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.w.a.n.e:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> b
     com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder decoder -> a
@@ -20645,7 +20688,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):959:959 -> a
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     2:2:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):34 -> a
     3:8:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):36:41 -> a
     boolean isLiveProtoFieldObject() -> e
@@ -20672,31 +20715,31 @@
     35:47:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):121:133 -> 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 notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):133 -> a
-    49:78:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):134:163 -> a
-    79:117:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):160:198 -> a
-    118:119:int com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getHazzerBitFieldIndex(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):134:135 -> a
-    118:119:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):199 -> a
-    120:132:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):200:212 -> a
-    133:133:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):211:211 -> a
-    134:134:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):135:135 -> a
-    135:140:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):224:229 -> a
-    135:140:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):217 -> a
-    141:154:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):236:249 -> a
-    155:155:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    155:155:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):249 -> a
-    156:191:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):250:285 -> a
-    192:192:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):284:284 -> a
-    193:193:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):251:251 -> a
-    194:205:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):295:306 -> a
-    206:211:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):318:323 -> a
-    206:211:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):307 -> a
-    212:225:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):322:335 -> a
-    212:225:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):307 -> a
-    226:234:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):344:352 -> a
-    235:235:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    235:235:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):352 -> a
-    236:249:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):353:366 -> a
-    250:250:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):354:354 -> a
+    49:79:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):134:164 -> a
+    80:118:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):161:199 -> a
+    119:120:int com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo.getHazzerBitFieldIndex(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):134:135 -> a
+    119:120:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):200 -> a
+    121:133:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):201:213 -> a
+    134:134:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):212:212 -> a
+    135:135:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist) -> a
+    136:141:void registerWriteToOneOfObjectsWithLiveOneOfCaseObject(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):225:230 -> a
+    136:141:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):218 -> a
+    142:155:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):237:250 -> a
+    156:156:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    156:156:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):250 -> a
+    157:192:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):251:286 -> a
+    193:193:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):285:285 -> a
+    194:194:void registerWriteToOneOfObjectIfOneOfCaseObjectIsLive(com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):252:252 -> a
+    195:206:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):296:307 -> a
+    207:212:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):319:324 -> a
+    207:212:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):308 -> a
+    213:226:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):323:336 -> a
+    213:226:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):308 -> a
+    227:235:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):345:353 -> a
+    236:236:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    236:236:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):353 -> a
+    237:250:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):354:367 -> a
+    251:251:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):355:355 -> a
 com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.w.a.n.j.d:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType type -> b
     java.util.List objects -> d
@@ -20813,14 +20856,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):959:959 -> a
+    6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     6:6:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):28 -> a
     7:7:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):31:31 -> a
 com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.w.a.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):959:959 -> a
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     4:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):27 -> a
     5:5:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):29:29 -> a
 com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.w.a.n.j.m:
@@ -20847,12 +20890,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):973:973 -> a
+    2:2:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1045:1045 -> a
     2:2:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):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.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    3:3:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1045 -> a
     3:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
-    4:4:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):974:974 -> a
+    4:4:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1046:1046 -> a
     4:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
     com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject asProtoTypeObject() -> c
     boolean isProtoTypeObject() -> g
@@ -21255,8 +21298,8 @@
     int requiredRegisters() -> z
 com.android.tools.r8.ir.code.Add -> com.android.tools.r8.w.b.a:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():127:127 -> G2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():127:127 -> H2
     boolean isAdd() -> O0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -21275,7 +21318,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):67:67 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):82:82 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):47:47 -> f
-    int opcode() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.AlwaysMaterializingDefinition -> com.android.tools.r8.w.b.b:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):18:18 -> <init>
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -21285,9 +21328,9 @@
     4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):40:40 -> a
     5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):46:46 -> a
     6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):66:66 -> a
-    1:1:int maxInValueRegister():56:56 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():56:56 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.AlwaysMaterializingNop -> com.android.tools.r8.w.b.c:
     1:1:void <init>():19:19 -> <init>
     boolean hasInvariantOutType() -> I0
@@ -21299,9 +21342,9 @@
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49:49 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):65:65 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:int maxInValueRegister():54:54 -> v2
-    1:1:int maxOutValueRegister():59:59 -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():54:54 -> w2
+    1:1:int maxOutValueRegister():59:59 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.AlwaysMaterializingUser -> com.android.tools.r8.w.b.d:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():15:15 -> <clinit>
@@ -21316,13 +21359,13 @@
     3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):66 -> a
     4:4:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):71:71 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:2:int maxInValueRegister():54:55 -> v2
-    1:1:int maxOutValueRegister():60:60 -> w2
-    int opcode() -> x2
+    1:2:int maxInValueRegister():54:55 -> w2
+    1:1:int maxOutValueRegister():60:60 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.And -> com.android.tools.r8.w.b.e:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):19:19 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():94:94 -> G2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():94:94 -> H2
     boolean isAnd() -> Q0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
@@ -21336,7 +21379,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):64:64 -> c
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):69:69 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):54:54 -> d
-    int opcode() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Argument -> com.android.tools.r8.w.b.f:
     boolean $assertionsDisabled -> i
     boolean knownToBeBoolean -> h
@@ -21357,14 +21400,14 @@
     6:6:boolean outTypeKnownToBeBoolean(java.util.Set):114:114 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.Argument asArgument() -> d
-    1:1:int maxInValueRegister():52:52 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():52:52 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ArithmeticBinop -> com.android.tools.r8.w.b.g:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):20:20 -> <init>
-    com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode() -> G2
+    com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode() -> H2
     boolean isArithmeticBinop() -> S0
     com.android.tools.r8.code.Instruction CreateDouble(int,int,int) -> a
     1:25:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):65:89 -> a
@@ -21390,10 +21433,10 @@
     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>
-    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 array():57:57 -> B2
-    1:1:com.android.tools.r8.ir.code.Value index():61:61 -> C2
+    boolean throwsOnNullInput() -> B2
+    1:1:com.android.tools.r8.ir.code.Value array():57:57 -> C2
+    1:1:com.android.tools.r8.ir.code.Value index():61:61 -> D2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     boolean isArrayGet() -> T0
@@ -21462,14 +21505,14 @@
     219:219:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):276:276 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> f
-    int maxInValueRegister() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ArrayLength -> com.android.tools.r8.w.b.i:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
-    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 throwsOnNullInput() -> B2
+    1:1:com.android.tools.r8.ir.code.Value array():42:42 -> C2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     boolean isArrayLength() -> U0
@@ -21492,19 +21535,19 @@
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):88:88 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> g
-    int maxInValueRegister() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ArrayPut -> com.android.tools.r8.w.b.j:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.MemberType type -> h
     1:1:void <clinit>():30:30 -> <clinit>
     1:5:void <init>(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):40:44 -> <init>
-    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 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 throwsOnNullInput() -> B2
+    1:1:com.android.tools.r8.ir.code.Value array():58:58 -> C2
+    1:1:com.android.tools.r8.ir.code.Value index():62:62 -> D2
+    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> E2
     boolean hasInvariantOutType() -> I0
     1:5:boolean instructionInstanceCanThrow():136:140 -> M0
     boolean instructionTypeCanThrow() -> N0
@@ -21535,19 +21578,19 @@
     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() -> v2
-    1:1:int maxOutValueRegister():125:125 -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():125:125 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Assume -> com.android.tools.r8.w.b.k:
     com.android.tools.r8.ir.code.Instruction origin -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.Assume$Assumption assumption -> h
     1:1:void <clinit>():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 -> B2
-    1:1:com.android.tools.r8.ir.code.Instruction origin():85:85 -> C2
+    1:1:com.android.tools.r8.ir.code.Assume$Assumption getAssumption():77:77 -> C2
     boolean isIntroducingAnAlias() -> D1
-    1:1:com.android.tools.r8.ir.code.Value src():81:81 -> D2
+    1:1:com.android.tools.r8.ir.code.Instruction origin():85:85 -> D2
+    1:1:com.android.tools.r8.ir.code.Value src():81:81 -> E2
     boolean hasInvariantOutType() -> I0
     boolean isAssume() -> W0
     1:1:boolean isAssumeDynamicType():132:132 -> X0
@@ -21561,7 +21604,7 @@
     30:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):199:199 -> a
     31:31:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):204:204 -> a
     32:36:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):224:228 -> a
-    37:37:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forAssume():236:236 -> a
+    37:37:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forAssume():235:235 -> a
     37:37:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):234 -> a
     38:45:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):239:246 -> a
     46:46:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):240:240 -> a
@@ -21580,7 +21623,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() -> e2
+    boolean isOutConstant() -> f2
     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
@@ -21598,10 +21641,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 -> v2
     1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():194:194 -> w0
-    1:1:int maxOutValueRegister():214:214 -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():209:209 -> w2
+    1:1:int maxOutValueRegister():214:214 -> x2
+    int opcode() -> y2
     1:1:boolean isAssumeNone():119:119 -> z0
     1:1:java.lang.String getInstructionName():95 -> z0
     2:2:boolean isAssumeDynamicType():132:132 -> z0
@@ -21670,250 +21713,251 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap localsAtEntry -> a
     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():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:2:com.android.tools.r8.ir.code.BasicBlock getUniquePredecessor():229:230 -> A
+    1:2:boolean hasCatchHandlers():543:544 -> B
+    1:1:boolean hasIncompletePhis():1132:1132 -> C
+    1:1:boolean hasOneNormalExit():1518:1518 -> D
+    1:1:boolean hasPhis():527:527 -> E
+    1:1:boolean hasUniquePredecessor():225:225 -> F
+    1:2:void incrementUnfilledPredecessorCount():667:668 -> G
+    1:1:boolean isEmpty():612:612 -> H
+    1:1:boolean isFilled():535:535 -> I
+    1:1:boolean isSealed():1120:1120 -> J
+    1:11:boolean isSimpleAlwaysThrowingPath():1495:1505 -> K
+    1:1:boolean isTrivialGoto():1450:1450 -> L
+    1:1:com.android.tools.r8.ir.code.InstructionIterator iterator():1594:1594 -> M
+    1:1:int numberOfCatchHandlers():1543:1543 -> N
+    1:2:int numberOfThrowingInstructions():1548:1549 -> O
+    1:2:void removeAllNormalSuccessors():290:291 -> P
+    3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> P
+    3:3:void removeAllNormalSuccessors():291 -> P
+    4:12:void removeAllNormalSuccessors():292:300 -> P
+    1:1:void setFilledForTesting():539:539 -> Q
+    1:9:java.lang.String toDetailedString():1173:1181 -> R
+    10:10:boolean isFilled():535:535 -> R
+    10:10:java.lang.String toDetailedString():1181 -> R
+    11:12:java.lang.String toDetailedString():1181:1182 -> R
+    13:13:boolean isSealed():1120:1120 -> R
+    13:13:java.lang.String toDetailedString():1182 -> R
+    14:51:java.lang.String toDetailedString():1182:1219 -> R
+    52:52:int digits(int):1169:1169 -> R
+    52:52:java.lang.String toDetailedString():1219 -> R
+    53:88:java.lang.String toDetailedString():1219:1254 -> R
+    1:3:void unlinkCatchHandler():781:783 -> S
+    1:5:com.android.tools.r8.ir.code.BasicBlock unlinkSinglePredecessor():742:746 -> T
+    1:5:void unlinkSinglePredecessorSiblingsAllowed():752:756 -> U
+    1:6:com.android.tools.r8.ir.code.BasicBlock unlinkSingleSuccessor():765:770 -> V
+    1:2:boolean verifyFilledPredecessors():682:683 -> W
+    1:2:boolean notifyPredecessorsMayChangeListeners():243:244 -> X
+    1:2:boolean notifySuccessorsMayChangeListeners():197:198 -> Y
     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
+    9:26:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):266:283 -> a
     27:27:void com.android.tools.r8.ir.code.Phi.removeTrivialPhi():227:227 -> 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):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):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):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):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):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):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
+    27:27:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):284 -> a
+    28:45:void swapSuccessorsByIndex(int,int):313:330 -> a
+    46:53:void replacePredecessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):445:452 -> a
+    54:62:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):456:464 -> a
+    63:63:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180:180 -> a
+    63:63:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):464 -> a
+    64:82:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):464:482 -> a
+    83:83:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180:180 -> a
+    83:83:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):484 -> a
+    84:100:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):484:500 -> a
+    101:101:java.lang.Iterable instructionsAfter(com.android.tools.r8.ir.code.Instruction):574:574 -> a
+    102:103:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):643:644 -> a
+    104:106:void clearMark(int):656:658 -> a
+    107:107:void addPhi(com.android.tools.r8.ir.code.Phi):688:688 -> a
+    108:108:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):702:702 -> a
+    109:109:boolean isFilled():535:535 -> a
+    109:109:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):702 -> a
+    110:113:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):702:705 -> a
+    114:114:void close(com.android.tools.r8.ir.conversion.IRBuilder):709:709 -> a
+    115:115:boolean isFilled():535:535 -> a
+    115:115:void close(com.android.tools.r8.ir.conversion.IRBuilder):709 -> a
+    116:120:void close(com.android.tools.r8.ir.conversion.IRBuilder):709:713 -> a
+    121:121:boolean com.android.tools.r8.ir.code.JumpInstruction.isJumpInstruction():0:0 -> a
+    121:121:void close(com.android.tools.r8.ir.conversion.IRBuilder):713 -> a
+    122:122:void close(com.android.tools.r8.ir.conversion.IRBuilder):714:714 -> a
+    123:124:boolean verifyNoValuesAfterThrowingInstruction():1580:1581 -> a
+    123:124:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
+    125:125:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1598:1598 -> a
+    125:125:boolean verifyNoValuesAfterThrowingInstruction():1581 -> a
+    125:125:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
+    126:131:boolean verifyNoValuesAfterThrowingInstruction():1582:1587 -> a
+    126:131:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
+    132:132:void close(com.android.tools.r8.ir.conversion.IRBuilder):715:715 -> a
+    133:144:void filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1079:1090 -> a
+    133:144:void close(com.android.tools.r8.ir.conversion.IRBuilder):716 -> a
+    145:145:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):796:796 -> a
+    146:150:boolean isCatchHandlerForSingleGuard():822:826 -> a
+    146:150:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):797 -> a
+    151:155:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):799:803 -> a
+    156:156:boolean lambda$removeCatchHandlerWithGuard$6(int,com.android.tools.r8.ir.code.BasicBlock):814:814 -> a
+    157:166:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):843:852 -> a
+    167:176:void linkCatchSuccessors(java.util.List,java.util.List):891:900 -> a
+    177:189:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):904:916 -> a
+    190:193:int numberOfNormalSuccessors():218:221 -> a
+    190:193:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):917 -> a
+    194:207:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):922:935 -> a
+    208:218:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLense):946:956 -> a
+    219:220:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1006:1007 -> a
+    219:220:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1019 -> a
+    221:223:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1021:1023 -> a
+    224:242:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1044:1062 -> a
+    243:247:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1069:1073 -> a
+    248:251:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1072:1075 -> a
+    252:253:com.android.tools.r8.ir.code.BasicBlock$EdgeType getEdgeType(com.android.tools.r8.ir.code.BasicBlock):1095:1096 -> a
+    254:258:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1124:1128 -> a
+    259:266:void appendBasicBlockList(java.lang.StringBuilder,java.util.List,java.util.function.Function):1141:1148 -> a
+    267:270:void printDebugValueSet(java.lang.String,java.util.List,java.lang.StringBuilder):1258:1261 -> a
+    271:303:void print(com.android.tools.r8.utils.CfgPrinter):1266:1298 -> a
+    304:305:void printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1302:1303 -> a
+    306:318:void removeInstructions(java.util.List):1324:1336 -> a
+    319:319:void setInstructions(java.util.LinkedList):1316:1316 -> a
+    319:319:void removeInstructions(java.util.List):1337 -> a
+    320:321:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):1361:1362 -> a
+    322:326:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1375:1379 -> a
+    327:333:com.android.tools.r8.ir.code.BasicBlock createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.Instruction[]):1410:1416 -> a
+    334:343:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1432:1441 -> a
+    344:344:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
+    344:344:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1442 -> a
+    345:345:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
+    345:345:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1443 -> a
+    346:347:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1444:1445 -> a
+    348:349:boolean canThrow():1557:1558 -> a
+    350:350:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1606:1606 -> a
+    351:351:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1610:1610 -> a
+    351:351:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1606 -> a
+    352:352:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1610:1610 -> a
+    353:353:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1614:1614 -> a
+    354:354:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1625:1625 -> a
+    355:366:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1643:1654 -> a
+    367:372:void moveCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1675:1680 -> a
+    367:372:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1658 -> a
+    373:377:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1662:1666 -> a
+    378:394:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1691:1707 -> a
+    395:425:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1726:1756 -> a
+    395:425:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    426:426:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
+    426:426:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1757 -> a
+    426:426:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    427:430:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1758:1761 -> a
+    427:430:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    431:431:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
+    431:431:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1762 -> a
+    431:431:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    432:437:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1763:1768 -> a
+    432:437:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    438:438:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746:1746 -> a
+    438:438:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    439:439:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    439:439:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746 -> a
+    439:439:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    440:474:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746:1780 -> a
+    440:474:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    475:475:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):130:130 -> a
+    475:475:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1782 -> a
+    475:475:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    476:476:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1783:1783 -> a
+    476:476:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    477:477:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1726:1726 -> a
+    477:477:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    1:1:void lambda$notifyPredecessorsMayChangeListeners$2(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):244:244 -> b
+    2:32:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):335:365 -> b
     33:33:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> b
-    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
+    33:33:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):367 -> b
+    34:34:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):367:367 -> 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):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
+    35:35:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):368 -> b
+    36:39:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):368:371 -> b
+    40:44:boolean hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):432:436 -> b
+    40:44:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):371 -> b
+    45:97:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):371:423 -> b
+    98:99:void removePhisByIndex(java.util.List):521:522 -> b
+    100:100:java.lang.Iterable instructionsBefore(com.android.tools.r8.ir.code.Instruction):578:578 -> b
+    101:102:void decrementUnfilledPredecessorCount(int):672:673 -> b
+    103:104:void removePhi(com.android.tools.r8.ir.code.Phi):692:693 -> b
+    105:114:void removeCatchHandlerWithGuard(com.android.tools.r8.graph.DexType):808:817 -> b
+    115:142:java.util.Set cleanForRemoval():857:884 -> b
+    143:144:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1006:1007 -> b
+    143:144:boolean isOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1013 -> b
+    145:148:boolean hasCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1100:1103 -> 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
+    2:6:void swapSuccessors(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):305:309 -> c
+    7:8:boolean isMarked(int):662:663 -> c
+    9:9:boolean blocksClean(java.util.List):728:728 -> c
+    10:10:void clearCatchHandlers():1534:1534 -> c
+    11:11:com.android.tools.r8.ir.code.InstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1602:1602 -> c
+    12:24:boolean hasPathTo(com.android.tools.r8.ir.code.BasicBlock):1884:1896 -> c
+    1:4:void link(com.android.tools.r8.ir.code.BasicBlock):721:724 -> d
+    5:7:void clearCurrentDefinitions():992:994 -> d
+    8:10:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1345:1347 -> d
+    11:11:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1598:1598 -> d
+    1:3:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):260:262 -> 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):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
+    4:4:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):262 -> e
+    5:5:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):262:262 -> e
+    6:7:void clearUserInfo():638:639 -> e
+    8:11:void mark(int):649:652 -> e
+    12:12:com.android.tools.r8.ir.code.InstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1602:1602 -> e
+    12:12:java.util.Iterator lambda$instructionsAfter$3(com.android.tools.r8.ir.code.Instruction):574 -> e
+    1:2:int numberInstructions(int):562:563 -> f
+    3:3:java.util.Iterator lambda$instructionsBefore$4(com.android.tools.r8.ir.code.Instruction):579:579 -> f
+    4:5:boolean consistentCatchHandlers():963:964 -> f
+    6:6:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlersWithSuccessorIndexes():1530:1530 -> f
+    6:6:boolean consistentCatchHandlers():965 -> f
+    7:8:boolean consistentCatchHandlers():967:968 -> f
+    9:28:boolean consistentCatchHandlers():967:986 -> f
+    29:30:void transferCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1538:1539 -> f
+    1:2:void setNumber(int):553:554 -> g
+    3:4:void decrementUnfilledPredecessorCount():677:678 -> g
+    5:79:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1800:1874 -> g
     int onThrowValueRegister(int) -> h
-    1:2:void lambda$blocksClean$5(com.android.tools.r8.ir.code.BasicBlock):723:724 -> h
-    3:17:void deduplicatePhis():1892:1906 -> h
+    1:2:void lambda$blocksClean$5(com.android.tools.r8.ir.code.BasicBlock):730:731 -> h
+    3:17:void deduplicatePhis():1927:1941 -> 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:4:void detachAllSuccessors():835:838 -> i
+    5:6:boolean verifyOnThrowWrite(int):1570:1571 -> i
+    1:2:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1162:1163 -> j
+    3:11:int guardsForCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1107:1115 -> j
+    3:11:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1163 -> j
+    12:12:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1163:1163 -> j
+    13:15:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1478:1480 -> j
+    1:1:com.android.tools.r8.ir.code.Instruction entry():616:616 -> k
+    1:2:com.android.tools.r8.ir.code.Instruction exceptionalExit():626:627 -> l
+    3:3:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1598:1598 -> l
+    3:3:com.android.tools.r8.ir.code.Instruction exceptionalExit():627 -> l
+    4:6:com.android.tools.r8.ir.code.Instruction exceptionalExit():628:630 -> l
+    1:3:com.android.tools.r8.ir.code.JumpInstruction exit():620:622 -> m
+    1:5:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlers():1522:1526 -> n
+    1:1:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlersWithSuccessorIndexes():1530:1530 -> o
+    1:1:java.util.LinkedList getInstructions():570:570 -> p
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getLocalsAtEntry():94:94 -> q
-    1:2:java.util.List getMutablePredecessors():231:232 -> r
+    1:2:java.util.List getMutablePredecessors():238:239 -> 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:7:java.util.List getNormalPredecessors():250:256 -> t
+    1:1:java.lang.String toString():1154:1154 -> 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:2:int getNumber():548:549 -> v
+    1:1:java.lang.String getNumberAsString():558:558 -> w
+    1:1:java.util.List getPhis():531:531 -> x
+    1:1:java.util.List getPredecessors():234:234 -> y
     1:1:java.util.List getSuccessors():188:188 -> z
 com.android.tools.r8.ir.code.BasicBlock$1 -> com.android.tools.r8.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
+    1:4:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):579:582 -> <init>
+    1:3:com.android.tools.r8.ir.code.Instruction advance():585:587 -> f
+    1:1:boolean hasNext():596:596 -> hasNext
+    1:5:com.android.tools.r8.ir.code.Instruction next():601:605 -> next
+    1:5:java.lang.Object next():579 -> next
+    6:6:com.android.tools.r8.ir.code.Instruction next():603:603 -> next
+    6:6:java.lang.Object next():579 -> next
 com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener -> com.android.tools.r8.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
@@ -21923,24 +21967,24 @@
     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>():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):1885 -> doHash
-    3:3:int doHash(java.lang.Object):1869 -> doHash
+    1:1:void <clinit>():1904:1904 -> <clinit>
+    1:1:void <init>():1904:1904 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.BasicBlock$1):1904:1904 -> <init>
+    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):1904:1904 -> doEquivalent
+    2:4:boolean doEquivalent(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi):1907:1909 -> doEquivalent
+    2:4:boolean doEquivalent(java.lang.Object,java.lang.Object):1904 -> doEquivalent
+    1:1:int doHash(java.lang.Object):1904:1904 -> doHash
+    2:2:int doHash(com.android.tools.r8.ir.code.Phi):1919:1919 -> doHash
+    2:2:int doHash(java.lang.Object):1904 -> doHash
+    3:3:int com.android.tools.r8.ir.code.Value.hashCode():764:764 -> doHash
+    3:3:int doHash(com.android.tools.r8.ir.code.Phi):1920 -> doHash
+    3:3:int doHash(java.lang.Object):1904 -> doHash
 com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo -> com.android.tools.r8.w.b.l$e:
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo CAN_THROW -> b
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo NO_THROW -> a
     1:2:void <clinit>():104:105 -> <clinit>
     1:1:void <init>(java.lang.String,int):103:103 -> <init>
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     1:1:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):108 -> a
     2:2:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):108:108 -> a
 com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.w.b.m:
@@ -21976,74 +22020,76 @@
     4:17:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):187:200 -> a
     18:18:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):185:185 -> a
     19:23:com.android.tools.r8.ir.code.Value insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):205:209 -> a
-    24:28:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):214:218 -> a
-    29:52:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):228:251 -> a
-    53:53:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    53:53:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):251 -> a
-    54:67:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):251:264 -> a
-    68:68:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):229:229 -> a
-    69:78:void lambda$replaceCurrentInstructionWithThrowNull$1(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.BasicBlock):266:275 -> a
-    79:86:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):283:290 -> a
-    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():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
-    94:98:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):297:301 -> a
-    99:100:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> a
-    99:100:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):301 -> a
-    101:119:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):302:320 -> a
-    120:127:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):329:336 -> a
-    128:160:void splitBlockAndCopyCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):362:394 -> a
-    161:166:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):432:437 -> a
-    167:173:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.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
-    174:176:boolean canThrow(com.android.tools.r8.ir.code.IRCode):342:344 -> a
-    174:176:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.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
-    177:194:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):460:477 -> a
-    195:195:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    195:195:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):477 -> a
-    196:203:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):477:484 -> a
-    204:204:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    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):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
-    246:246:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):528 -> a
-    247:251:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):528:532 -> a
-    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):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):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):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):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
-    374:400:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):641:667 -> a
-    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):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
+    24:47:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):228:251 -> a
+    48:48:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
+    48:48:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):251 -> a
+    49:62:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):251:264 -> a
+    63:63:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):229:229 -> a
+    64:73:void lambda$replaceCurrentInstructionWithThrowNull$1(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.BasicBlock):266:275 -> a
+    74:81:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):283:290 -> a
+    82:82:boolean hasNext():57:57 -> a
+    82:82:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):290 -> a
+    83:86:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):290:293 -> a
+    87:87:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
+    87:87:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):293 -> a
+    88:88:boolean hasPrevious():73:73 -> a
+    88:88:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):297 -> a
+    89:93:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):297:301 -> a
+    94:95:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> a
+    94:95:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):301 -> a
+    96:114:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):302:320 -> a
+    115:122:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):329:336 -> a
+    123:155:void splitBlockAndCopyCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):362:394 -> a
+    156:161:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):432:437 -> a
+    162:168:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):448:454 -> a
+    169:171:boolean canThrow(com.android.tools.r8.ir.code.IRCode):342:344 -> a
+    169:171:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):456 -> a
+    172:189:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):460:477 -> a
+    190:190:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
+    190:190:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):477 -> a
+    191:198:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):477:484 -> a
+    199:199:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
+    199:199:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):487 -> a
+    200:203:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):487:490 -> a
+    204:206:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):489:491 -> a
+    207:207:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    207:207:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):492 -> a
+    208:240:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):492:524 -> a
+    241:241:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
+    241:241:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):528 -> a
+    242:246:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):528:532 -> a
+    247:247:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
+    247:247:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):533 -> a
+    248:255:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):533:540 -> a
+    256:256:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    256:256:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):540 -> a
+    257:276:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):540:559 -> a
+    277:277:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    277:277:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):559 -> a
+    278:278:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):562:562 -> a
+    279:279:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    279:279:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):561 -> a
+    280:313:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):560:593 -> a
+    314:314:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):946:946 -> a
+    314:314:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):593 -> a
+    315:328:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):596:609 -> a
+    329:345:void appendCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):409:425 -> a
+    329:345:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):610 -> a
+    346:351:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):617:622 -> a
+    352:352:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    352:352:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):622 -> a
+    353:363:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):622:632 -> a
+    364:368:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):631:635 -> a
+    369:395:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):641:667 -> a
+    396:396:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):130:130 -> a
+    396:396:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):672 -> a
+    397:397:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):673:673 -> a
+    398:398:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    398:398:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):673 -> a
+    399:416:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):673:690 -> a
+    417:417:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    417:417:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):214 -> a
+    418:420:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):216:218 -> a
     1:1:void add(java.lang.Object):28:28 -> add
     1:7:void add(com.android.tools.r8.ir.code.Instruction):102:108 -> b
     1:7:void removeOrReplaceByDebugLocalRead():172:178 -> d
@@ -22094,15 +22140,15 @@
 com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.w.b.p:
     com.android.tools.r8.ir.code.NumericType type -> h
     1:8:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:31 -> <init>
-    1:1:com.android.tools.r8.ir.code.NumericType getNumericType():36:36 -> 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
+    1:1:com.android.tools.r8.ir.code.NumericType getNumericType():36:36 -> C2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.ir.code.Value leftValue():40:40 -> E2
+    1:2:int maxInOutValueRegisterSize():82:83 -> F2
+    1:1:com.android.tools.r8.ir.code.Value rightValue():44:44 -> G2
     boolean hasInvariantOutType() -> I0
     boolean isBinop() -> Z0
     1:8:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):51:58 -> a
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1254:1254 -> a
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1256:1256 -> a
     9:9:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58 -> a
     10:10:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58:58 -> a
     11:11:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forBinop():75:75 -> a
@@ -22118,8 +22164,8 @@
     1:3:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):64 -> g
     1:3:boolean fitsInLit8Instruction(com.android.tools.r8.ir.code.Value):74:76 -> h
     com.android.tools.r8.ir.code.Binop asBinop() -> l
-    1:1:int maxInValueRegister():90:90 -> v2
-    1:1:int maxOutValueRegister():95:95 -> w2
+    1:1:int maxInValueRegister():90:90 -> w2
+    1:1:int maxOutValueRegister():95:95 -> x2
 com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.w.b.q:
     java.util.Map canonicalPositions -> b
     boolean $assertionsDisabled -> e
@@ -22158,24 +22204,25 @@
     4:4:boolean hasCatchAll(com.android.tools.r8.graph.DexItemFactory):76 -> a
     5:5:boolean hasCatchAll(com.android.tools.r8.graph.DexItemFactory):76:76 -> a
     6:6:java.util.List getAllTargets():64:64 -> a
-    7:16:com.android.tools.r8.ir.code.CatchHandlers removeGuard(com.android.tools.r8.graph.DexType):80:89 -> a
-    17:18:void lambda$removeGuard$0(com.android.tools.r8.graph.DexType,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,java.lang.Object):85:86 -> a
-    19:20:void forEach(java.util.function.BiConsumer):93:94 -> a
+    7:10:com.android.tools.r8.ir.code.CatchHandlers appendGuard(com.android.tools.r8.graph.DexType,java.lang.Object):80:83 -> a
+    11:20:com.android.tools.r8.ir.code.CatchHandlers removeGuard(com.android.tools.r8.graph.DexType):87:96 -> a
+    21:22:void lambda$removeGuard$0(com.android.tools.r8.graph.DexType,java.util.List,java.util.List,com.android.tools.r8.graph.DexType,java.lang.Object):92:93 -> a
+    23:24:void forEach(java.util.function.BiConsumer):100:101 -> a
     1:1:java.util.List access$100(com.android.tools.r8.ir.code.CatchHandlers):17:17 -> b
     2:2:java.util.List getGuards():60:60 -> b
     1:4:java.util.Set getUniqueTargets():68:71 -> c
-    1:5:boolean equals(java.lang.Object):124:128 -> equals
-    1:1:int hashCode():133:133 -> hashCode
+    1:5:boolean equals(java.lang.Object):131:135 -> equals
+    1:1:int hashCode():140:140 -> hashCode
     1:1:boolean isEmpty():51:51 -> isEmpty
-    1:1:java.util.Iterator iterator():100:100 -> iterator
+    1:1:java.util.Iterator iterator():107:107 -> iterator
     1:2:int size():55:56 -> size
 com.android.tools.r8.ir.code.CatchHandlers$1 -> com.android.tools.r8.w.b.r$a:
     com.android.tools.r8.ir.code.CatchHandlers this$0 -> b
     int nextIndex -> a
-    1:3:void <init>(com.android.tools.r8.ir.code.CatchHandlers):100:102 -> <init>
-    1:1:boolean hasNext():106:106 -> hasNext
-    1:4:com.android.tools.r8.ir.code.CatchHandlers$CatchHandler next():111:114 -> next
-    1:4:java.lang.Object next():100 -> next
+    1:3:void <init>(com.android.tools.r8.ir.code.CatchHandlers):107:109 -> <init>
+    1:1:boolean hasNext():113:113 -> hasNext
+    1:4:com.android.tools.r8.ir.code.CatchHandlers$CatchHandler next():118:121 -> next
+    1:4:java.lang.Object next():107 -> next
 com.android.tools.r8.ir.code.CatchHandlers$CatchHandler -> com.android.tools.r8.w.b.r$b:
     java.lang.Object target -> b
     com.android.tools.r8.graph.DexType guard -> a
@@ -22185,10 +22232,10 @@
     com.android.tools.r8.graph.DexType type -> h
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):30:31 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getType():45:45 -> 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
+    1:1:com.android.tools.r8.graph.DexType getType():45:45 -> C2
+    1:1:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> D2
+    1:1:com.android.tools.r8.ir.code.Value object():49 -> D2
+    2:2:com.android.tools.r8.ir.code.Value object():49:49 -> D2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41:41 -> a
@@ -22207,15 +22254,15 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> m
     1:1:java.lang.String toString():108:108 -> toString
-    int maxInValueRegister() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.w.b.t:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.Cmp$Bias bias -> i
     1:1:void <clinit>():26:26 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):35:36 -> <init>
-    boolean isCommutative() -> C2
+    boolean isCommutative() -> D2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:28:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:84 -> a
     29:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:86 -> a
@@ -22234,9 +22281,9 @@
     com.android.tools.r8.ir.code.Cmp asCmp() -> n
     1:17:java.lang.String toString():104:120 -> toString
     18:40:java.lang.String toString():109:131 -> toString
-    int maxInValueRegister() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.w.b.t$a:
     com.android.tools.r8.ir.code.Cmp$Bias LT -> c
     com.android.tools.r8.ir.code.Cmp$Bias NONE -> a
@@ -22251,7 +22298,7 @@
     com.android.tools.r8.graph.DexType clazz -> h
     1:1:void <clinit>():24:24 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):29:30 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getValue():61:61 -> B2
+    1:1:com.android.tools.r8.graph.DexType getValue():61:61 -> C2
     boolean instructionInstanceCanThrow() -> M0
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):40:40 -> a
@@ -22287,12 +22334,12 @@
     49:49:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):182:182 -> a
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):131:131 -> b
     boolean isConstClass() -> c1
-    boolean isOutConstant() -> e2
+    boolean isOutConstant() -> f2
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> o
     1:1:java.lang.String toString():83:83 -> toString
-    1:1:int maxInValueRegister():72:72 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():72:72 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.w.b.v:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):33:33 -> <init>
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> D0
@@ -22311,7 +22358,7 @@
     com.android.tools.r8.graph.DexMethodHandle methodHandle -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethodHandle):25:26 -> <init>
-    1:1:com.android.tools.r8.graph.DexMethodHandle getValue():57:57 -> B2
+    1:1:com.android.tools.r8.graph.DexMethodHandle getValue():57:57 -> C2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
     2:2:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):49:49 -> a
@@ -22327,21 +22374,21 @@
     11:11:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):120:120 -> a
     12:12:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):126:126 -> a
     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 com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodHandle():275:275 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):85 -> a
     boolean isConstMethodHandle() -> e1
-    boolean isOutConstant() -> e2
+    boolean isOutConstant() -> f2
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> q
     1:1:java.lang.String toString():95:95 -> toString
-    1:1:int maxInValueRegister():78:78 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():78:78 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.w.b.x:
     com.android.tools.r8.graph.DexProto methodType -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProto):25:26 -> <init>
-    1:1:com.android.tools.r8.graph.DexProto getValue():57:57 -> B2
+    1:1:com.android.tools.r8.graph.DexProto getValue():57:57 -> C2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
     2:2:com.android.tools.r8.ir.code.ConstMethodType copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodType):49:49 -> a
@@ -22357,34 +22404,34 @@
     11:11:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):114:114 -> a
     12:12:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):120:120 -> a
     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 com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodType():279:279 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):131 -> a
-    boolean isOutConstant() -> e2
     boolean isConstMethodType() -> f1
+    boolean isOutConstant() -> f2
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> r
     1:1:java.lang.String toString():89:89 -> toString
-    1:1:int maxInValueRegister():78:78 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():78:78 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.w.b.y:
     boolean $assertionsDisabled -> i
     long value -> h
     1:1:void <clinit>():32:32 -> <clinit>
     1:6:void <init>(com.android.tools.r8.ir.code.Value,long):37:42 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value dest():68:68 -> 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
+    1:1:com.android.tools.r8.ir.code.Value dest():68:68 -> C2
+    1:2:double getDoubleValue():92:93 -> D2
+    1:2:float getFloatValue():87:88 -> E2
+    1:2:int getIntValue():76:77 -> F2
+    3:5:int getIntValue():76:78 -> F2
+    1:2:long getLongValue():82:83 -> G2
+    1:1:long getRawValue():97:97 -> H2
+    1:1:boolean is16Bit():273:273 -> I2
+    1:1:boolean is8Bit():265:265 -> J2
+    1:1:boolean isIntegerOne():109:109 -> K2
+    1:1:boolean isIntegerZero():105:105 -> L2
+    1:1:boolean isZero():101:101 -> M2
+    1:1:boolean negativeIs16Bit():277:277 -> N2
+    1:1:boolean negativeIs8Bit():269:269 -> O2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:4:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):56:59 -> a
     5:5:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstNumber):64:64 -> a
@@ -22426,20 +22473,20 @@
     107:107:boolean outTypeKnownToBeBoolean(java.util.Set):325:325 -> a
     1:4:boolean verifyTypes(com.android.tools.r8.graph.AppView):316:319 -> b
     5:5:boolean verifyTypes(com.android.tools.r8.graph.AppView):317:317 -> b
-    boolean isOutConstant() -> e2
+    boolean isOutConstant() -> f2
     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 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():234:234 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.w.b.z:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexString value -> h
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> i
     1:1:void <clinit>():20:20 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):26:28 -> <init>
-    1:1:com.android.tools.r8.graph.DexString getValue():58:58 -> B2
+    1:1:com.android.tools.r8.graph.DexString getValue():58:58 -> C2
     1:11:boolean instructionInstanceCanThrow():110:120 -> M0
     1:1:boolean instructionTypeCanThrow():90:90 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -22460,7 +22507,7 @@
     12:13:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:64 -> a
     14:14:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):69:69 -> a
     15:15:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129:129 -> a
-    16:16:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     16:16:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129 -> a
     17:17:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129:129 -> a
     18:18:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):134:134 -> a
@@ -22468,13 +22515,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() -> e2
+    boolean isOutConstant() -> f2
     boolean isConstString() -> h1
     com.android.tools.r8.ir.code.ConstString asConstString() -> t
     1:1:java.lang.String toString():85:85 -> toString
-    1:1:int maxInValueRegister():74:74 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():74:74 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.w.b.A:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -22501,9 +22548,9 @@
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):70 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     boolean isDebugLocalRead() -> l1
-    1:1:int maxInValueRegister():59:59 -> v2
-    1:1:int maxOutValueRegister():64:64 -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():59:59 -> w2
+    1:1:int maxOutValueRegister():64:64 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.w.b.C:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):21:21 -> <init>
     boolean isAllowedAfterThrowingInstruction() -> P0
@@ -22519,7 +22566,7 @@
     2:2:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):60:60 -> a
     3:3:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):65:65 -> a
     4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):71:71 -> a
-    boolean isOutConstant() -> e2
+    boolean isOutConstant() -> f2
     boolean isDebugLocalWrite() -> n1
     com.android.tools.r8.ir.code.DebugLocalWrite asDebugLocalWrite() -> u
 com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.w.b.E:
@@ -22528,8 +22575,8 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap ending -> h
     1:1:void <clinit>():19:19 -> <clinit>
     1:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):26:29 -> <init>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():43:43 -> B2
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():47:47 -> C2
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():43:43 -> C2
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():47:47 -> D2
     boolean hasInvariantOutType() -> I0
     boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -22550,9 +22597,9 @@
     boolean isDebugLocalsChange() -> o1
     1:6:java.lang.String toString():92:97 -> toString
     com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> v
-    1:1:int maxInValueRegister():77:77 -> v2
-    1:1:int maxOutValueRegister():82:82 -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():77:77 -> w2
+    1:1:int maxOutValueRegister():82:82 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.w.b.F:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():16:16 -> <clinit>
@@ -22569,10 +22616,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):66 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     boolean isDebugPosition() -> p1
-    1:1:int maxInValueRegister():55:55 -> v2
     com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> w
-    1:1:int maxOutValueRegister():60:60 -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():55:55 -> w2
+    1:1:int maxOutValueRegister():60:60 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.w.b.G:
     1:1:void <init>():7:7 -> <init>
     java.lang.Object handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction) -> a
@@ -22594,8 +22641,8 @@
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> i
     1:1:void <clinit>():22:22 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):33:36 -> <init>
-    1:1:com.android.tools.r8.graph.DexReference getItem():63:63 -> B2
-    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():67:67 -> C2
+    1:1:com.android.tools.r8.graph.DexReference getItem():63:63 -> C2
+    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():67:67 -> D2
     boolean instructionInstanceCanThrow() -> M0
     1:1:boolean instructionTypeCanThrow():113:113 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -22621,17 +22668,17 @@
     19:19:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):146:146 -> a
     20:20:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):151:151 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isOutConstant() -> e2
+    boolean isOutConstant() -> f2
     boolean isDexItemBasedConstString() -> q1
     1:1:java.lang.String toString():108:108 -> toString
-    1:1:int maxInValueRegister():97:97 -> v2
-    int maxOutValueRegister() -> w2
+    1:1:int maxInValueRegister():97:97 -> w2
     com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> x
-    int opcode() -> x2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Div -> com.android.tools.r8.w.b.I:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> G2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> H2
     1:1:boolean instructionTypeCanThrow():134:134 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -22651,8 +22698,8 @@
     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() -> r1
-    int opcode() -> x2
     com.android.tools.r8.ir.code.Div asDiv() -> y
+    int opcode() -> y2
 com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.w.b.K:
     com.android.tools.r8.ir.code.BasicBlock[] sorted -> a
     com.android.tools.r8.ir.code.BasicBlock[] doms -> b
@@ -22711,13 +22758,13 @@
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):21:21 -> <init>
     2:3:void <init>(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.Value):25:26 -> <init>
-    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():51:51 -> B2
-    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
+    1:1:com.android.tools.r8.ir.code.StackValue outBottom():55 -> C2
+    2:2:com.android.tools.r8.ir.code.StackValue outBottom():55:55 -> C2
+    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():51:51 -> D2
+    1:1:com.android.tools.r8.ir.code.StackValue outTop():59 -> D2
+    2:2:com.android.tools.r8.ir.code.StackValue outTop():59:59 -> D2
+    1:1:com.android.tools.r8.ir.code.StackValue src():63:63 -> E2
     boolean hasInvariantOutType() -> I0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -22729,9 +22776,9 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):41:46 -> e
     boolean isDup() -> s1
-    int maxInValueRegister() -> v2
-    1:1:int maxOutValueRegister():92:92 -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():92:92 -> x2
+    int opcode() -> y2
     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
@@ -22749,9 +22796,9 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):55:60 -> e
     boolean isDup2() -> t1
-    int maxInValueRegister() -> v2
-    1:1:int maxOutValueRegister():106:106 -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():106:106 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.w.b.O:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexField field -> h
@@ -22759,16 +22806,16 @@
     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 -> B2
-    1:1:com.android.tools.r8.ir.code.FieldMemberType getType():39:39 -> C2
-    com.android.tools.r8.ir.code.Value value() -> D2
+    1:1:com.android.tools.r8.graph.DexField getField():43:43 -> C2
+    1:1:com.android.tools.r8.ir.code.FieldMemberType getType():39:39 -> D2
+    com.android.tools.r8.ir.code.Value value() -> E2
     boolean hasInvariantOutType() -> I0
     1:7:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):59:65 -> a
     8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
     8:8:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):68 -> a
     9:21:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):70:82 -> a
-    22:22:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():115:115 -> a
-    22:22:boolean com.android.tools.r8.graph.DexEncodedField.isStaticMember():124 -> a
+    22:22:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():114:114 -> a
+    22:22:boolean com.android.tools.r8.graph.DexEncodedField.isStaticMember():123 -> a
     22:22:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):86 -> a
     23:66:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):87:130 -> a
     67:67:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):105:105 -> a
@@ -22828,7 +22875,7 @@
     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 -> C2
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():36:39 -> D2
     boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -22838,10 +22885,10 @@
     5:10:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):104:109 -> a
     11:11:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):117:117 -> a
     1:4:java.lang.String toString():71:74 -> toString
-    1:1:int maxInValueRegister():59:59 -> v2
-    1:1:int maxOutValueRegister():65:65 -> w2
+    1:1:int maxInValueRegister():59:59 -> w2
     boolean isGoto() -> x1
-    int opcode() -> x2
+    1:1:int maxOutValueRegister():65:65 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.w.b.T:
     com.android.tools.r8.ir.code.ValueNumberGenerator valueNumberGenerator -> c
     com.android.tools.r8.graph.DexEncodedMethod method -> a
@@ -22854,209 +22901,213 @@
     com.android.tools.r8.utils.InternalOptions options -> i
     com.android.tools.r8.origin.Origin origin -> j
     java.util.LinkedList blocks -> b
-    1:1:void <clinit>():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():804:815 -> A
-    1:8:boolean verifyNoNullabilityBottomTypes():819:826 -> B
-    1:14:boolean verifySplitCriticalEdges():325:338 -> C
-    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: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):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
+    1:1:void <clinit>():48:48 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod,java.util.LinkedList,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):122:122 -> <init>
+    2:32:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod,java.util.LinkedList,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):102:132 -> <init>
+    1:20:void traceBlocks():397:416 -> A
+    21:33:void traceBlocks():415:427 -> A
+    34:34:boolean noColorsInUse():1145:1145 -> A
+    34:34:void traceBlocks():427 -> A
+    35:35:void traceBlocks():427:427 -> A
+    1:12:boolean verifyNoImpreciseOrBottomTypes():849:860 -> B
+    1:8:boolean verifyNoNullabilityBottomTypes():864:871 -> C
+    1:14:boolean verifySplitCriticalEdges():370:383 -> D
+    1:6:boolean computeAllThrowingInstructionsHavePositions():1068:1073 -> E
+    1:12:boolean verifyNoValueWithOnlyAssumeInstructionAsUsers():875:886 -> F
+    1:17:boolean controlFlowMayDependOnEnvironment(com.android.tools.r8.graph.AppView):263:279 -> a
+    18:18:boolean lambda$prepareBlocksForCatchHandlers$0(com.android.tools.r8.ir.code.BasicBlock):331:331 -> a
+    19:23:void ensureBlockNumbering():431:435 -> a
+    19:23:void print(com.android.tools.r8.utils.CfgPrinter):537 -> a
+    24:25:void print(com.android.tools.r8.utils.CfgPrinter):538:539 -> a
+    26:26:void removeBlocks(java.util.Collection):475:475 -> a
+    27:27:boolean lambda$verifyTypes$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.BasicBlock):589:589 -> a
+    28:28:void lambda$consistentBlockNumbering$2(java.lang.Integer,java.lang.Long):744:744 -> a
+    29:35:boolean lambda$verifyNoImpreciseOrBottomTypes$3(com.android.tools.r8.ir.code.Value):851:857 -> a
+    36:36:boolean lambda$verifyNoImpreciseOrBottomTypes$3(com.android.tools.r8.ir.code.Value):856:856 -> a
+    37:40:boolean lambda$wrapSSAVerifierWithStackValueHandling$8(java.util.function.Predicate,com.android.tools.r8.ir.code.Value):893:896 -> a
+    41:41:java.lang.Iterable instructions(java.util.function.Predicate):920:920 -> a
+    42:54:java.util.List collectArguments(boolean):976:988 -> a
+    42:54:java.util.List collectArguments():972 -> a
+    55:55:java.util.List collectArguments(boolean):987:987 -> a
+    55:55:java.util.List collectArguments():972 -> a
+    56:56:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):1004:1004 -> a
+    57:58:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int,com.android.tools.r8.graph.DebugLocalInfo):1026:1027 -> a
+    59:59:void setAllThrowingInstructionsHavePositions(boolean):1064:1064 -> a
+    60:63:void removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):1093:1096 -> a
+    64:64:boolean isMarkingColorInUse(int):1132:1132 -> a
+    65:65:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1149:1149 -> a
+    66:74:java.util.Set getBlocksReachableFromExclusive(com.android.tools.r8.ir.code.BasicBlock):1174:1182 -> a
+    66:74:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1150 -> a
+    75:80:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1151:1156 -> a
+    81:81:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    81:81:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1156 -> a
+    82:88:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1157:1163 -> a
+    89:89:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    89:89:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1163 -> a
+    90:90:void markTransitiveSuccessors(java.util.Deque,int):1221:1221 -> a
+    91:91:boolean isMarkingColorInUse(int):1132:1132 -> a
+    91:91:void markTransitiveSuccessors(java.util.Deque,int):1221 -> a
+    92:93:boolean anyBlocksMarkedWithColor(int):1136:1137 -> a
+    92:93:void markTransitiveSuccessors(java.util.Deque,int):1221 -> a
+    94:103:void markTransitiveSuccessors(java.util.Deque,int):1221:1230 -> a
+    104:104:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1242:1242 -> a
+    105:105:boolean isMarkingColorInUse(int):1132:1132 -> a
+    105:105:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1242 -> a
+    106:117:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1242:1253 -> a
+    118:118:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(com.android.tools.r8.ir.code.Instruction):1602:1602 -> a
+    118:118:java.util.Iterator lambda$getInstructionsReachableFrom$10(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):1161 -> a
+    1:52:java.util.Map computeLiveAtEntrySets():147:198 -> b
+    53:73:java.util.Map computeLiveAtEntrySets():197:217 -> b
     74:74:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> b
-    74:74:java.util.Map computeLiveAtEntrySets():223 -> b
-    75:110:java.util.Map computeLiveAtEntrySets():223:258 -> b
-    111:111:boolean com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets.isEmpty():78:78 -> b
-    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):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):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):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():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():1073:1073 -> o
-    2:2:boolean isConsistentGraph():527 -> o
-    3:5:boolean isConsistentGraph():527:529 -> o
-    6:21:boolean consistentPredecessorSuccessors():665:680 -> o
-    6:21:boolean isConsistentGraph():529 -> o
-    22:22:boolean isConsistentGraph():530:530 -> o
-    23:24:boolean consistentCatchHandlers():687:688 -> o
-    23:24:boolean isConsistentGraph():530 -> o
-    25:25:boolean isConsistentGraph():531:531 -> o
-    26:29:boolean consistentBlockInstructions():706:709 -> o
-    26:29:boolean isConsistentGraph():531 -> o
+    74:74:java.util.Map computeLiveAtEntrySets():221 -> b
+    75:110:java.util.Map computeLiveAtEntrySets():221:256 -> b
+    111:111:boolean com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets.isEmpty():81:81 -> b
+    111:111:java.util.Map computeLiveAtEntrySets():256 -> b
+    112:114:java.util.Map computeLiveAtEntrySets():256:258 -> b
+    115:125:boolean hasNoVerticallyMergedClasses(com.android.tools.r8.graph.AppView):554:564 -> b
+    126:128:boolean lambda$verifyNoNullabilityBottomTypes$4(com.android.tools.r8.ir.code.Value):866:868 -> b
+    129:129:boolean lambda$verifyNoNullabilityBottomTypes$4(com.android.tools.r8.ir.code.Value):866:866 -> b
+    130:130:java.util.Iterator lambda$instructions$9(java.util.function.Predicate):920:920 -> b
+    131:131:java.util.ListIterator listIterator(int):946:946 -> b
+    132:132:boolean lambda$findFirstNonNonePosition$11(com.android.tools.r8.ir.code.Instruction):1261:1261 -> b
+    1:2:boolean verifyTypes(com.android.tools.r8.graph.AppView):585:586 -> c
+    3:6:boolean validAssumeDynamicTypeInstructions(com.android.tools.r8.graph.AppView):594:597 -> c
+    3:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):586 -> c
+    7:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):587:589 -> c
+    10:15:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$7(com.android.tools.r8.ir.code.Value):877:882 -> c
+    16:22:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$7(com.android.tools.r8.ir.code.Value):877:883 -> c
+    23:23:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$5(com.android.tools.r8.ir.code.Instruction):878:878 -> c
+    24:31:boolean verifySSATypeLattice(java.util.function.Predicate):902:909 -> c
+    32:38:java.util.List computeNormalExitBlocks():932:938 -> c
+    39:39:void returnMarkingColor(int):1126:1126 -> c
+    40:40:boolean isMarkingColorInUse(int):1132:1132 -> c
+    40:40:void returnMarkingColor(int):1126 -> c
+    41:41:void returnMarkingColor(int):1126:1126 -> c
+    42:43:void clearMarks(int):452:453 -> c
+    42:43:void returnMarkingColor(int):1127 -> c
+    44:44:void returnMarkingColor(int):1128:1128 -> c
+    1:4:boolean consistentBlockNumbering():739:742 -> d
+    5:5:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$6(com.android.tools.r8.ir.code.Instruction):881:881 -> d
+    6:6:java.util.function.Predicate wrapSSAVerifierWithStackValueHandling(java.util.function.Predicate):890:890 -> d
+    1:1:com.android.tools.r8.ir.code.ConstNumber createConstNull():1050:1050 -> e
+    2:2:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> e
+    2:2:com.android.tools.r8.ir.code.ConstNumber createConstNull():1050 -> e
+    3:3:com.android.tools.r8.ir.code.ConstNumber createConstNull():1051:1051 -> e
+    1:1:boolean doAllThrowingInstructionsHavePositions():1060:1060 -> f
+    1:1:com.android.tools.r8.ir.code.BasicBlock entryBlock():140:140 -> g
+    1:14:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1261:1274 -> h
+    1:1:int getHighestBlockNumber():1040:1040 -> i
+    1:1:int getNextInstructionNumber():968:968 -> j
+    1:7:com.android.tools.r8.ir.code.Value getThis():993:999 -> k
+    1:3:java.util.Set getUnreachableBlocks():1187:1189 -> l
+    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1217:1217 -> l
+    4:4:java.util.Set getUnreachableBlocks():1189 -> l
+    5:10:java.util.Set getUnreachableBlocks():1190:1195 -> l
+    1:1:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():924:924 -> m
+    1:1:java.lang.Iterable instructions():916:916 -> n
+    1:1:boolean isConsistentGraph():572:572 -> o
+    2:2:boolean noColorsInUse():1145:1145 -> o
+    2:2:boolean isConsistentGraph():572 -> o
+    3:5:boolean isConsistentGraph():572:574 -> o
+    6:21:boolean consistentPredecessorSuccessors():710:725 -> o
+    6:21:boolean isConsistentGraph():574 -> o
+    22:22:boolean isConsistentGraph():575:575 -> o
+    23:24:boolean consistentCatchHandlers():732:733 -> o
+    23:24:boolean isConsistentGraph():575 -> o
+    25:25:boolean isConsistentGraph():576:576 -> o
+    26:29:boolean consistentBlockInstructions():751:754 -> o
+    26:29:boolean isConsistentGraph():576 -> o
     30:39:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean):65:74 -> o
-    30:39:boolean consistentBlockInstructions():707 -> o
-    30:39:boolean isConsistentGraph():531 -> o
+    30:39:boolean consistentBlockInstructions():752 -> o
+    30:39:boolean isConsistentGraph():576 -> o
     40:44:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean):73:77 -> o
-    40:44:boolean consistentBlockInstructions():707 -> o
-    40:44:boolean isConsistentGraph():531 -> o
-    45:45:boolean isConsistentGraph():532:532 -> o
-    46:102:boolean consistentMetadata():716:772 -> o
-    46:102:boolean isConsistentGraph():532 -> o
-    103:103:boolean isConsistentGraph():533:533 -> o
-    1:2:boolean isConsistentSSA():499:500 -> p
-    3:23:boolean consistentDefUseChains():589:609 -> p
-    3:23:boolean isConsistentSSA():500 -> p
+    40:44:boolean consistentBlockInstructions():752 -> o
+    40:44:boolean isConsistentGraph():576 -> o
+    45:45:boolean isConsistentGraph():577:577 -> o
+    46:102:boolean consistentMetadata():761:817 -> o
+    46:102:boolean isConsistentGraph():577 -> o
+    103:103:boolean isConsistentGraph():578:578 -> o
+    1:2:boolean isConsistentSSA():544:545 -> p
+    3:23:boolean consistentDefUseChains():634:654 -> p
+    3:23:boolean isConsistentSSA():545 -> p
     24:24:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> p
-    24:24:boolean consistentDefUseChains():611 -> p
-    24:24:boolean isConsistentSSA():500 -> p
-    25:37:boolean consistentDefUseChains():611:623 -> p
-    25:37:boolean isConsistentSSA():500 -> p
-    38:38:boolean verifyValue(com.android.tools.r8.ir.code.Value):631:631 -> p
-    38:38:boolean consistentDefUseChains():623 -> p
-    38:38:boolean isConsistentSSA():500 -> p
-    39:39:boolean verifyPhi(com.android.tools.r8.ir.code.Phi):636:636 -> p
-    39:39:boolean verifyValue(com.android.tools.r8.ir.code.Value):631 -> p
-    39:39:boolean consistentDefUseChains():623 -> p
-    39:39:boolean isConsistentSSA():500 -> p
-    40:43:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):641:644 -> p
-    40:43:boolean verifyValue(com.android.tools.r8.ir.code.Value):631 -> p
-    40:43:boolean consistentDefUseChains():623 -> p
-    40:43:boolean isConsistentSSA():500 -> p
-    44:44:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):642:642 -> p
-    44:44:boolean verifyValue(com.android.tools.r8.ir.code.Value):631 -> p
-    44:44:boolean consistentDefUseChains():623 -> p
-    44:44:boolean isConsistentSSA():500 -> p
-    45:45:boolean consistentDefUseChains():624:624 -> p
-    45:45:boolean isConsistentSSA():500 -> p
-    46:47:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):649:650 -> p
-    46:47:boolean consistentDefUseChains():624 -> p
-    46:47:boolean isConsistentSSA():500 -> p
+    24:24:boolean consistentDefUseChains():656 -> p
+    24:24:boolean isConsistentSSA():545 -> p
+    25:37:boolean consistentDefUseChains():656:668 -> p
+    25:37:boolean isConsistentSSA():545 -> p
+    38:38:boolean verifyValue(com.android.tools.r8.ir.code.Value):676:676 -> p
+    38:38:boolean consistentDefUseChains():668 -> p
+    38:38:boolean isConsistentSSA():545 -> p
+    39:39:boolean verifyPhi(com.android.tools.r8.ir.code.Phi):681:681 -> p
+    39:39:boolean verifyValue(com.android.tools.r8.ir.code.Value):676 -> p
+    39:39:boolean consistentDefUseChains():668 -> p
+    39:39:boolean isConsistentSSA():545 -> p
+    40:43:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):686:689 -> p
+    40:43:boolean verifyValue(com.android.tools.r8.ir.code.Value):676 -> p
+    40:43:boolean consistentDefUseChains():668 -> p
+    40:43:boolean isConsistentSSA():545 -> p
+    44:44:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):687:687 -> p
+    44:44:boolean verifyValue(com.android.tools.r8.ir.code.Value):676 -> p
+    44:44:boolean consistentDefUseChains():668 -> p
+    44:44:boolean isConsistentSSA():545 -> p
+    45:45:boolean consistentDefUseChains():669:669 -> p
+    45:45:boolean isConsistentSSA():545 -> p
+    46:47:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):694:695 -> p
+    46:47:boolean consistentDefUseChains():669 -> p
+    46:47:boolean isConsistentSSA():545 -> p
     48:48:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> p
-    48:48:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):650 -> p
-    48:48:boolean consistentDefUseChains():624 -> p
-    48:48:boolean isConsistentSSA():500 -> p
-    49:57:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):650:658 -> p
-    49:57:boolean consistentDefUseChains():624 -> p
-    49:57:boolean isConsistentSSA():500 -> p
-    58:58:boolean isConsistentSSA():501:501 -> p
-    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():901:903 -> s
-    1:7:int numberRemainingInstructions():909:915 -> t
-    1:7:java.lang.String toString():397:403 -> toString
-    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():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
-    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():441 -> y
-    25:25:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():442:442 -> y
-    26:37:com.android.tools.r8.com.google.common.collect.ImmutableList reorderExceptionalBlocksLastForTesting(com.android.tools.r8.com.google.common.collect.ImmutableList):477:488 -> y
-    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():1073:1073 -> z
-    34:34:void traceBlocks():382 -> z
-    35:35:void traceBlocks():382:382 -> z
+    48:48:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):695 -> p
+    48:48:boolean consistentDefUseChains():669 -> p
+    48:48:boolean isConsistentSSA():545 -> p
+    49:57:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):695:703 -> p
+    49:57:boolean consistentDefUseChains():669 -> p
+    49:57:boolean isConsistentSSA():545 -> p
+    58:58:boolean isConsistentSSA():546:546 -> p
+    59:75:boolean validThrowingInstructions():825:841 -> p
+    59:75:boolean isConsistentSSA():546 -> p
+    76:76:boolean isConsistentSSA():547:547 -> p
+    77:88:boolean noCriticalEdges():605:616 -> p
+    77:88:boolean isConsistentSSA():547 -> p
+    89:91:boolean isConsistentSSA():547:549 -> p
+    1:1:java.util.ListIterator listIterator():942:942 -> q
+    1:1:com.android.tools.r8.ir.code.IRMetadata metadata():136:136 -> r
+    1:3:com.android.tools.r8.com.google.common.collect.ImmutableList numberInstructions():950:952 -> s
+    1:7:int numberRemainingInstructions():958:964 -> t
+    1:7:java.lang.String toString():442:448 -> toString
+    1:25:void prepareBlocksForCatchHandlers():300:324 -> u
+    26:27:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> u
+    26:27:void prepareBlocksForCatchHandlers():324 -> u
+    28:34:void prepareBlocksForCatchHandlers():325:331 -> u
+    1:1:void removeAllTrivialPhis():1081:1081 -> v
+    1:3:java.util.Set removeUnreachableBlocks():1200:1202 -> w
+    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1217:1217 -> w
+    4:4:java.util.Set removeUnreachableBlocks():1202 -> w
+    5:14:java.util.Set removeUnreachableBlocks():1203:1212 -> w
+    1:1:int reserveMarkingColor():1102:1102 -> x
+    2:2:boolean anyMarkingColorAvailable():1116:1116 -> x
+    2:2:int reserveMarkingColor():1102 -> x
+    3:11:int reserveMarkingColor():1102:1110 -> x
+    12:13:boolean verifyNoBlocksMarked(int):468:469 -> x
+    12:13:int reserveMarkingColor():1110 -> x
+    1:24:void splitCriticalEdges():335:358 -> y
+    25:34:void splitCriticalEdges():357:366 -> y
+    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList depthFirstSorting():493:516 -> z
+    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():486 -> z
+    25:25:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():487:487 -> z
+    26:37:com.android.tools.r8.com.google.common.collect.ImmutableList reorderExceptionalBlocksLastForTesting(com.android.tools.r8.com.google.common.collect.ImmutableList):522:533 -> z
+    26:37:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():488 -> z
 com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.w.b.T$a:
     com.android.tools.r8.ir.code.BasicBlock block -> a
-    1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):86:87 -> <init>
+    1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):89:90 -> <init>
 com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.w.b.T$b:
     java.util.Deque liveStackValues -> c
     java.util.Set liveValues -> a
     java.util.Set liveLocalValues -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():49:49 -> <clinit>
-    1:5:void <init>(java.util.Set,java.util.Set,java.util.Deque):59:63 -> <init>
-    1:2:boolean equals(java.lang.Object):73:74 -> equals
-    1:1:int hashCode():68:68 -> hashCode
+    1:1:void <clinit>():52:52 -> <clinit>
+    1:5:void <init>(java.util.Set,java.util.Set,java.util.Deque):62:66 -> <init>
+    1:2:boolean equals(java.lang.Object):76:77 -> equals
+    1:1:int hashCode():71:71 -> hashCode
 com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.w.b.U:
     java.util.ListIterator blockIterator -> a
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> b
@@ -23184,18 +23235,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 -> B2
     com.android.tools.r8.ir.code.If asIf() -> C
-    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
+    1:4:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():132:135 -> C2
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTrueTarget():117:120 -> D2
+    1:1:com.android.tools.r8.ir.code.If$Type getType():106:106 -> E2
+    1:2:void invert():110:111 -> F2
+    3:4:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):140:141 -> F2
+    3:4:void invert():112 -> F2
+    5:5:void invert():113:113 -> F2
+    1:1:boolean isZeroTest():93:93 -> G2
+    1:1:com.android.tools.r8.ir.code.Value lhs():97:97 -> H2
+    1:2:com.android.tools.r8.ir.code.Value rhs():101:102 -> I2
+    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():214:216 -> J2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:3:boolean verifyTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.If$Type):65:67 -> a
     4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):146:146 -> a
@@ -23215,10 +23266,10 @@
     31:31:com.android.tools.r8.ir.code.BasicBlock targetFromCondition(int):223:223 -> b
     1:4:void setTrueTarget(com.android.tools.r8.ir.code.BasicBlock):124:127 -> c
     1:8:java.lang.String toString():161:168 -> toString
-    1:1:int maxInValueRegister():174:174 -> v2
-    1:1:int maxOutValueRegister():179:179 -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():174:174 -> w2
+    1:1:int maxOutValueRegister():179:179 -> x2
     boolean isIf() -> y1
+    int opcode() -> y2
 com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.w.b.X$a:
     com.android.tools.r8.ir.code.If$Type GT -> c
     com.android.tools.r8.ir.code.If$Type LE -> d
@@ -23253,18 +23304,17 @@
     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() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.w.b.a0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():34:34 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):37:37 -> <init>
-    boolean throwsOnNullInput() -> A2
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():207:207 -> B0
+    boolean throwsOnNullInput() -> B2
     com.android.tools.r8.ir.code.InstanceGet asInstanceGet() -> D
-    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:1:com.android.tools.r8.ir.code.Value value():66:66 -> E2
     1:2:com.android.tools.r8.ir.code.Value object():60:61 -> F2
     boolean instructionTypeCanThrow() -> N0
     1:1:boolean outTypeKnownToBeBoolean(java.util.Set):47:47 -> a
@@ -23294,16 +23344,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() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
     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>
     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
+    1:1:com.android.tools.r8.graph.DexType type():39:39 -> C2
+    1:1:com.android.tools.r8.ir.code.Value value():47:47 -> D2
     com.android.tools.r8.ir.code.InstanceOf asInstanceOf() -> E
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
@@ -23318,19 +23368,19 @@
     8:9:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):105:106 -> a
     10:10:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int maxInValueRegister() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.w.b.c0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():34:34 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):37:39 -> <init>
-    boolean throwsOnNullInput() -> A2
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():219:219 -> B0
     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
+    boolean throwsOnNullInput() -> B2
+    1:1:com.android.tools.r8.ir.code.Value value():58:58 -> E2
     com.android.tools.r8.ir.code.InstancePut asInstancePut() -> F
+    1:1:com.android.tools.r8.ir.code.Value object():53:53 -> F2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):49:49 -> a
     2:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:92 -> a
@@ -23354,9 +23404,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() -> v2
-    1:1:int maxOutValueRegister():170:170 -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():170:170 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.w.b.d0:
     java.util.List inValues -> b
     java.util.Set debugValues -> e
@@ -23375,10 +23425,11 @@
     com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction() -> A
     1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():595:595 -> A0
     boolean isInstanceOf() -> A1
-    boolean throwsOnNullInput() -> A2
+    1:1:com.android.tools.r8.ir.code.Value outValue():120:120 -> A2
     com.android.tools.r8.ir.code.Goto asGoto() -> B
-    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():1361:1361 -> B0
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():1365:1365 -> B0
     boolean isInstancePut() -> B1
+    boolean throwsOnNullInput() -> B2
     com.android.tools.r8.ir.code.If asIf() -> C
     1:1:int getNumber():342:342 -> C0
     boolean isIntSwitch() -> C1
@@ -23437,22 +23488,22 @@
     boolean isMonitor() -> T1
     com.android.tools.r8.ir.code.Load asLoad() -> U
     boolean isArrayLength() -> U0
-    boolean isMove() -> U1
+    boolean isMonitorEnter() -> U1
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> V
     boolean isArrayPut() -> V0
-    boolean isMoveException() -> V1
+    boolean isMove() -> V1
     com.android.tools.r8.ir.code.Monitor asMonitor() -> W
     boolean isAssume() -> W0
-    boolean isMul() -> W1
+    boolean isMoveException() -> W1
     com.android.tools.r8.ir.code.Move asMove() -> X
     boolean isAssumeDynamicType() -> X0
-    boolean isNeg() -> X1
+    boolean isMul() -> X1
     com.android.tools.r8.ir.code.MoveException asMoveException() -> Y
     boolean isAssumeNonNull() -> Y0
-    boolean isNewArrayEmpty() -> Y1
+    boolean isNeg() -> Y1
     com.android.tools.r8.ir.code.Mul asMul() -> Z
     boolean isBinop() -> Z0
-    boolean isNewArrayFilledData() -> Z1
+    boolean isNewArrayEmpty() -> Z1
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void buildCf(com.android.tools.r8.ir.conversion.CfBuilder) -> a
     void buildDex(com.android.tools.r8.ir.conversion.DexBuilder) -> a
@@ -23499,135 +23550,135 @@
     150:166:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):481 -> a
     167:168:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):487:488 -> a
     169:169:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):495:495 -> a
-    170:170:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():794:794 -> a
+    170:170:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():798:798 -> a
     170:170:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):495 -> a
-    171:171:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():794:794 -> a
+    171:171:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():798:798 -> a
     171:171:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):495 -> a
     172:178:boolean identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):499:505 -> a
     179:179:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):539:539 -> a
     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
+    181:182:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):1301:1302 -> a
+    183:186:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):1308:1311 -> a
+    187:189:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):1316:1318 -> a
+    190:196:boolean verifyValidPositionInfo(boolean):1385:1391 -> a
+    197:197:boolean verifyValidPositionInfo(boolean):1387:1387 -> a
     com.android.tools.r8.ir.code.Neg asNeg() -> a0
     boolean isCheckCast() -> a1
-    boolean isNewInstance() -> a2
+    boolean isNewArrayFilledData() -> a2
     com.android.tools.r8.ir.code.Add asAdd() -> b
     1:4:void addInValue(com.android.tools.r8.ir.code.Value):98:101 -> b
     5:8:void replaceValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):171:174 -> b
     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):528:528 -> b
-    18:29:boolean verifyTypes(com.android.tools.r8.graph.AppView):1319:1330 -> b
+    18:29:boolean verifyTypes(com.android.tools.r8.graph.AppView):1323:1334 -> b
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> b0
     boolean isCmp() -> b1
-    boolean isNot() -> b2
+    boolean isNewInstance() -> b2
     com.android.tools.r8.ir.code.And asAnd() -> c
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     boolean needsValueInRegister(com.android.tools.r8.ir.code.Value) -> c
     1:7:void clearUserInfo(com.android.tools.r8.ir.code.Instruction):152:158 -> c
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> c0
     boolean isConstClass() -> c1
-    boolean isNumberConversion() -> c2
+    boolean isNot() -> c2
     com.android.tools.r8.ir.code.Argument asArgument() -> d
     1:9:void removeDebugValue(com.android.tools.r8.ir.code.Value):218:226 -> d
     10:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):554:558 -> d
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> d0
     boolean isConstInstruction() -> d1
-    boolean isOr() -> d2
+    boolean isNumberConversion() -> d2
     com.android.tools.r8.ir.code.ArithmeticBinop asArithmeticBinop() -> e
     1:4:void setOutValue(com.android.tools.r8.ir.code.Value):124:127 -> e
     com.android.tools.r8.ir.code.Not asNot() -> e0
     boolean isConstMethodHandle() -> e1
-    boolean isOutConstant() -> e2
+    boolean isOr() -> e2
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> f
     1:5:com.android.tools.r8.ir.code.Value swapOutValue(com.android.tools.r8.ir.code.Value):132:136 -> f
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> f0
     boolean isConstMethodType() -> f1
-    boolean isPop() -> f2
+    boolean isOutConstant() -> f2
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> g
     com.android.tools.r8.ir.code.Or asOr() -> g0
     boolean isConstNumber() -> g1
-    boolean isRem() -> g2
+    boolean isPop() -> g2
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> h
     com.android.tools.r8.ir.code.Rem asRem() -> h0
     boolean isConstString() -> h1
-    boolean isReturn() -> h2
+    boolean isRem() -> h2
     com.android.tools.r8.ir.code.Assume asAssume() -> i
     com.android.tools.r8.ir.code.Return asReturn() -> i0
-    1:4:boolean isCreatingArray():1276:1279 -> i1
-    boolean isShl() -> i2
+    1:4:boolean isCreatingArray():1280:1283 -> i1
+    boolean isReturn() -> i2
     com.android.tools.r8.ir.code.Assume asAssumeDynamicType() -> j
     com.android.tools.r8.ir.code.Shl asShl() -> j0
-    1:1:boolean isCreatingInstanceOrArray():1283:1283 -> j1
-    boolean isShr() -> j2
+    1:1:boolean isCreatingInstanceOrArray():1287:1287 -> j1
+    boolean isShl() -> j2
     com.android.tools.r8.ir.code.Assume asAssumeNonNull() -> k
     com.android.tools.r8.ir.code.Shr asShr() -> k0
-    1:5:boolean isDebugInstruction():1080:1084 -> k1
-    boolean isStaticGet() -> k2
+    1:5:boolean isDebugInstruction():1084:1088 -> k1
+    boolean isShr() -> k2
     com.android.tools.r8.ir.code.Binop asBinop() -> l
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> l0
     boolean isDebugLocalRead() -> l1
-    boolean isStaticPut() -> l2
+    boolean isStaticGet() -> l2
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> m
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> m0
     boolean isDebugLocalUninitialized() -> m1
-    boolean isStore() -> m2
+    boolean isStaticPut() -> m2
     com.android.tools.r8.ir.code.Cmp asCmp() -> n
     com.android.tools.r8.ir.code.Store asStore() -> n0
     boolean isDebugLocalWrite() -> n1
-    boolean isStringSwitch() -> n2
+    boolean isStore() -> n2
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> o
     com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> o0
     boolean isDebugLocalsChange() -> o1
-    boolean isSub() -> o2
+    boolean isStringSwitch() -> o2
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> p
     com.android.tools.r8.ir.code.Sub asSub() -> p0
     boolean isDebugPosition() -> p1
-    boolean isSwap() -> p2
+    boolean isSub() -> p2
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> q
     com.android.tools.r8.ir.code.Switch asSwitch() -> q0
     boolean isDexItemBasedConstString() -> q1
-    boolean isSwitch() -> q2
+    boolean isSwap() -> q2
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> r
     com.android.tools.r8.ir.code.Throw asThrow() -> r0
     boolean isDiv() -> r1
-    boolean isThrow() -> r2
+    boolean isSwitch() -> r2
     com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> s
     com.android.tools.r8.ir.code.Ushr asUshr() -> s0
     boolean isDup() -> s1
-    boolean isUnop() -> s2
+    boolean isThrow() -> s2
     com.android.tools.r8.ir.code.ConstString asConstString() -> t
     com.android.tools.r8.ir.code.Xor asXor() -> t0
     boolean isDup2() -> t1
-    boolean isUshr() -> t2
+    boolean isUnop() -> t2
     1:14:java.lang.String toString():298:311 -> toString
     com.android.tools.r8.ir.code.DebugLocalWrite asDebugLocalWrite() -> u
     1:2:void clearBlock():273:274 -> u0
     1:1:boolean isFieldGet():856:856 -> u1
-    boolean isXor() -> u2
+    boolean isUshr() -> u2
     com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> v
     1:5:void clearDebugValues():245:249 -> v0
     boolean isFieldInstruction() -> v1
-    int maxInValueRegister() -> v2
+    boolean isXor() -> v2
     com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> w
-    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():1271:1271 -> w0
+    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():1275:1275 -> w0
     1:1:boolean isFieldPut():860:860 -> w1
-    int maxOutValueRegister() -> w2
+    int maxInValueRegister() -> w2
     com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> x
     1:2:com.android.tools.r8.ir.code.BasicBlock getBlock():257:258 -> x0
     boolean isGoto() -> x1
-    int opcode() -> x2
+    int maxOutValueRegister() -> x2
     com.android.tools.r8.ir.code.Div asDiv() -> y
     1:1:java.util.Set getDebugValues():599:599 -> y0
     boolean isIf() -> y1
-    1:1:com.android.tools.r8.ir.code.ValueType outType():163:163 -> y2
+    int opcode() -> y2
     com.android.tools.r8.ir.code.Dup asDup() -> z
     1:1:java.lang.String getInstructionName():293:293 -> z0
     boolean isInstanceGet() -> z1
-    1:1:com.android.tools.r8.ir.code.Value outValue():120:120 -> z2
+    1:1:com.android.tools.r8.ir.code.ValueType outType():163:163 -> z2
 com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.w.b.e0:
     1:3:com.android.tools.r8.ir.code.Instruction peekNext():30:32 -> b
     1:3:com.android.tools.r8.ir.code.Instruction peekPrevious():45:47 -> e
@@ -23641,11 +23692,11 @@
     void setInsertionPosition(com.android.tools.r8.ir.code.Position) -> a
     com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator) -> a
     com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator) -> a
-    1:3:java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate):18:20 -> a
-    4:4:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode):99:99 -> a
-    5:5:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int):126:126 -> a
-    6:8:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode):174:176 -> a
-    java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate) -> b
+    1:1:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode):99:99 -> a
+    2:2:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int):126:126 -> a
+    3:5:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode):174:176 -> a
+    1:3:java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate):18:20 -> b
+    1:3:java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate):0 -> b
     void removeOrReplaceByDebugLocalRead() -> d
     1:1:void removeInstructionIgnoreOutValue():43:43 -> h
 com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.w.b.g0:
@@ -23655,14 +23706,14 @@
     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() -> C1
-    1:7:boolean valid():55:61 -> F2
     com.android.tools.r8.ir.code.IntSwitch asIntSwitch() -> G
-    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
+    1:7:boolean valid():55:61 -> G2
+    1:1:int getFirstKey():177:177 -> I2
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():214:215 -> J2
+    3:3:int getKey(int):206:206 -> J2
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216 -> J2
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216:216 -> J2
+    1:1:int[] getKeys():210:210 -> K2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> a
     1:1:void forEachCase(com.android.tools.r8.utils.IntObjConsumer):48:48 -> a
@@ -23712,34 +23763,34 @@
     5:5:int getKey(int):206:206 -> toString
     5:5:java.lang.String toString():268 -> toString
     6:11:java.lang.String toString():268:273 -> toString
-    int maxInValueRegister() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.w.b.i0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):61:61 -> <init>
-    1:1:java.util.List arguments():103:103 -> B2
-    com.android.tools.r8.graph.DexType getReturnType() -> C2
-    com.android.tools.r8.ir.code.Invoke$Type getType() -> D2
+    1:1:java.util.List arguments():103:103 -> C2
+    com.android.tools.r8.graph.DexType getReturnType() -> 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$Type getType() -> E2
+    java.lang.String getTypeString() -> F2
+    1:1:int requiredArgumentRegisters():108:108 -> G2
+    2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> G2
+    2:2:int requiredArgumentRegisters():109 -> G2
     com.android.tools.r8.ir.code.Invoke asInvoke() -> H
+    1:1:java.util.List arguments():103:103 -> H2
+    1:1:boolean argumentsAreConsecutiveInputArguments():222 -> H2
+    2:2:boolean argumentsAreConsecutiveInputArguments():222:222 -> H2
+    3:3:java.util.List arguments():103:103 -> H2
+    3:3:boolean argumentsAreConsecutiveInputArguments():225 -> H2
+    4:5:boolean argumentsAreConsecutiveInputArguments():225:226 -> H2
+    6:6:java.util.List arguments():103:103 -> H2
+    6:6:boolean argumentsAreConsecutiveInputArguments():229 -> H2
+    7:7:boolean argumentsAreConsecutiveInputArguments():229:229 -> H2
+    8:8:java.util.List arguments():103:103 -> H2
+    8:8:boolean argumentsAreConsecutiveInputArguments():230 -> H2
+    9:10:boolean argumentsAreConsecutiveInputArguments():230:231 -> H2
     boolean instructionTypeCanThrow() -> N0
     1:21:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):71:91 -> a
     22:22:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):89:89 -> a
@@ -23761,13 +23812,13 @@
     44:44:java.util.List arguments():103:103 -> a
     44:44:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):130 -> a
     45:54:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):130:139 -> a
-    55:55:int com.android.tools.r8.ir.code.Value.requiredRegisters():291:291 -> a
+    55:55:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> a
     55:55:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):140 -> a
     56:58:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):141:143 -> a
-    59:59:int com.android.tools.r8.ir.code.Value.requiredRegisters():291:291 -> a
+    59:59:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> a
     59:59:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):143 -> a
     60:60:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):143:143 -> a
-    61:61:int com.android.tools.r8.ir.code.Value.requiredRegisters():291:291 -> a
+    61:61:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> a
     61:61:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):144 -> a
     62:63:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):145:146 -> a
     64:77:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):165:178 -> a
@@ -23780,7 +23831,7 @@
     1:1:java.util.List arguments():103:103 -> b
     1:1:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):153 -> b
     2:3:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):153:154 -> b
-    4:4:int com.android.tools.r8.ir.code.Value.requiredRegisters():291:291 -> b
+    4:4:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> b
     4:4:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):154 -> b
     5:5:java.util.List arguments():103:103 -> b
     5:5:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):155 -> b
@@ -23788,7 +23839,7 @@
     7:7:java.util.List arguments():103:103 -> b
     7:7:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):156 -> b
     8:9:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):156:157 -> b
-    10:10:int com.android.tools.r8.ir.code.Value.requiredRegisters():291:291 -> b
+    10:10:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> b
     10:10:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):158 -> b
     1:1:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):240:240 -> c
     2:2:java.util.List arguments():103:103 -> c
@@ -23797,10 +23848,10 @@
     11:11:java.util.List arguments():103:103 -> c
     11:11:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):255 -> c
     12:13:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):255:256 -> c
-    1:1:java.util.List arguments():103:103 -> v2
-    1:1:int maxInValueRegister():213 -> v2
-    2:4:int maxInValueRegister():213:215 -> v2
-    int maxOutValueRegister() -> w2
+    1:1:java.util.List arguments():103:103 -> w2
+    1:1:int maxInValueRegister():213 -> w2
+    2:4:int maxInValueRegister():213:215 -> w2
+    int maxOutValueRegister() -> x2
     1:1:java.lang.String getInstructionName():269:269 -> z0
 com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.w.b.i0$a:
     com.android.tools.r8.ir.code.Invoke$Type NEW_ARRAY -> f
@@ -23828,11 +23879,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 -> C2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():110:110 -> D2
-    java.lang.String getTypeString() -> E2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():101:101 -> D2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():110:110 -> E2
     boolean isInvokeCustom() -> F1
-    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> G2
+    java.lang.String getTypeString() -> F2
+    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> H2
     com.android.tools.r8.ir.code.InvokeCustom asInvokeCustom() -> I
     boolean hasInvariantOutType() -> I0
     1:29:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):66:94 -> a
@@ -23869,17 +23920,17 @@
     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() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.w.b.k0:
     boolean $assertionsDisabled -> m
     boolean itf -> l
     1:1:void <clinit>():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 -> D2
-    java.lang.String getTypeString() -> E2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():67:67 -> E2
+    java.lang.String getTypeString() -> F2
     boolean isInvokeDirect() -> G1
-    1:1:boolean isInterface():57:57 -> I2
     com.android.tools.r8.ir.code.InvokeDirect asInvokeDirect() -> J
+    1:1:boolean isInterface():57:57 -> J2
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:96 -> a
     20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):113:113 -> a
     21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):159:159 -> a
@@ -23899,13 +23950,13 @@
     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() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.w.b.l0:
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():26:26 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):29:29 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():44:44 -> D2
-    java.lang.String getTypeString() -> E2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():44:44 -> E2
+    java.lang.String getTypeString() -> F2
     boolean isInvokeInterface() -> H1
     com.android.tools.r8.ir.code.InvokeInterface asInvokeInterface() -> K
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:73 -> a
@@ -23918,65 +23969,65 @@
     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
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.w.b.m0:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexMethod method -> i
-    1:1:void <clinit>():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
+    1:1:void <clinit>():24:24 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):29:30 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getReturnType():35:35 -> D2
+    1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():39:39 -> H2
     boolean hasInvariantOutType() -> I0
     boolean isInvokeMethod() -> I1
     com.android.tools.r8.ir.code.InvokeMethod asInvokeMethod() -> L
-    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.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
+    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):44:44 -> a
+    2:7:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):79:84 -> a
     8:8:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    8:8:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):88 -> a
-    9:9:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):88:88 -> a
+    8:8:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):89 -> a
+    9:9:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):89:89 -> a
     10:10:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    10:10:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):89 -> a
-    11:12:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):89:90 -> a
+    10:10:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):90 -> a
+    11:12:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):90:91 -> a
     13:13:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    13:13:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):90 -> a
-    14:14:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):90:90 -> a
+    13:13:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):91 -> a
+    14:14:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):91:91 -> a
     15:15:boolean com.android.tools.r8.utils.InternalOptions.canHaveIncorrectJoinForArrayOfInterfacesBug():0:0 -> a
-    15:15:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):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
+    15:15:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):83 -> a
+    16:24:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):102:110 -> a
+    25:25:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):121:121 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):130:130 -> d
+    1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):131:131 -> d
     com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> e
     java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> f
-    1:1:java.lang.String toString():48:48 -> toString
+    1:1:java.lang.String toString():49:49 -> toString
 com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.w.b.n0:
     boolean $assertionsDisabled -> k
-    1:1:void <clinit>():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
+    1:1:void <clinit>():22:22 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):25:25 -> <init>
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():66:66 -> B0
+    boolean throwsOnNullInput() -> B2
+    1:2:com.android.tools.r8.ir.code.Value getReceiver():39:40 -> I2
     boolean isInvokeMethodWithReceiver() -> J1
     com.android.tools.r8.ir.code.InvokeMethodWithReceiver asInvokeMethodWithReceiver() -> M
-    1:1:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.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
+    1:1:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):50:50 -> a
+    2:2:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):56:56 -> a
+    1:15:boolean verifyTypes(com.android.tools.r8.graph.AppView):71:85 -> b
+    16:16:boolean verifyTypes(com.android.tools.r8.graph.AppView):84:84 -> b
 com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.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 -> 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
+    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> D2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():65 -> D2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():56:56 -> E2
+    java.lang.String getTypeString() -> F2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> H2
     boolean hasInvariantOutType() -> I0
+    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> I2
+    1:1:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159 -> I2
+    2:13:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159:170 -> I2
     boolean isInvokeMultiNewArray() -> K1
     com.android.tools.r8.ir.code.InvokeMultiNewArray asInvokeMultiNewArray() -> N
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:75 -> a
@@ -24001,19 +24052,19 @@
     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() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.w.b.p0:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():25:25 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value,java.util.List):30:31 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> 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
+    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> D2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():46 -> D2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():55:55 -> E2
+    java.lang.String getTypeString() -> F2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> H2
     boolean hasInvariantOutType() -> I0
+    1:1:com.android.tools.r8.errors.Unreachable cfUnsupported():139:139 -> I2
     boolean isInvokeNewArray() -> L1
     com.android.tools.r8.ir.code.InvokeNewArray asInvokeNewArray() -> O
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:89 -> a
@@ -24036,73 +24087,73 @@
     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() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.w.b.q0:
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexProto proto -> k
-    1:1:void <clinit>():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
+    1:1:void <clinit>():28:28 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):33:34 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getReturnType():49:49 -> D2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():54:54 -> E2
+    java.lang.String getTypeString() -> F2
+    1:1:com.android.tools.r8.graph.DexProto getProto():63:63 -> I2
     boolean isInvokePolymorphic() -> M1
     com.android.tools.r8.ir.code.InvokePolymorphic asInvokePolymorphic() -> P
-    1:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):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
+    1:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):69:75 -> a
+    8:8:com.android.tools.r8.graph.DexProto getProto():63:63 -> a
+    8:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75 -> a
+    9:15:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:81 -> a
+    16:16:com.android.tools.r8.graph.DexProto getProto():63:63 -> a
+    16:16:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82 -> a
+    17:24:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:89 -> a
+    25:31:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):94:100 -> a
+    32:32:com.android.tools.r8.graph.DexProto getProto():63:63 -> a
+    32:32:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):100 -> a
+    33:34:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):100:101 -> a
+    35:37:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):106:108 -> 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):137:137 -> 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):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
+    39:39:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):137 -> a
+    40:42:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):149:151 -> 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
+    43:43:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):44 -> a
     com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> e
     java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> f
-    int opcode() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.w.b.r0:
     boolean itf -> k
     boolean $assertionsDisabled -> l
-    1:1:void <clinit>():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
+    1:1:void <clinit>():33:33 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:39 -> <init>
+    3:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):43:44 -> <init>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():59:59 -> E2
+    java.lang.String getTypeString() -> F2
     boolean isInvokeStatic() -> N1
     com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic() -> Q
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):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
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:88 -> a
+    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):93:93 -> a
+    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):139:139 -> a
+    22:22:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):149:149 -> a
+    23:23:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):155:155 -> a
+    24:24:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):165:165 -> a
     25:25:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeStatic):209:209 -> a
-    25:25:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):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
+    25:25:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):54 -> a
+    26:26:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):212:212 -> a
+    27:27:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):223:223 -> a
+    1:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):171:208 -> b
+    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):108:115 -> e
     9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> e
-    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):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
+    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):116 -> e
+    10:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):117:123 -> e
+    1:2:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):132:133 -> f
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.w.b.s0:
     boolean $assertionsDisabled -> m
     boolean itf -> l
     1:1:void <clinit>():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 -> D2
-    java.lang.String getTypeString() -> E2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():46:46 -> E2
+    java.lang.String getTypeString() -> F2
     boolean isInvokeSuper() -> O1
     com.android.tools.r8.ir.code.InvokeSuper asInvokeSuper() -> R
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:75 -> a
@@ -24114,13 +24165,13 @@
     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() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.w.b.t0:
     boolean $assertionsDisabled -> l
     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
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():47:47 -> E2
+    java.lang.String getTypeString() -> F2
     boolean isInvokeVirtual() -> P1
     com.android.tools.r8.ir.code.InvokeVirtual asInvokeVirtual() -> S
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:76 -> a
@@ -24135,14 +24186,14 @@
     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
+    int opcode() -> y2
 com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.w.b.u0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.code.Value):19:19 -> <init>
     3:3:void <init>(java.util.List):23:23 -> <init>
-    com.android.tools.r8.ir.code.BasicBlock fallthroughBlock() -> B2
+    com.android.tools.r8.ir.code.BasicBlock fallthroughBlock() -> C2
     boolean hasInvariantOutType() -> I0
     boolean isJumpInstruction() -> Q1
     com.android.tools.r8.ir.code.JumpInstruction asJumpInstruction() -> T
@@ -24186,7 +24237,7 @@
     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 -> B2
+    1:1:com.android.tools.r8.ir.code.Value src():36:36 -> C2
     boolean hasInvariantOutType() -> I0
     boolean isLoad() -> R1
     com.android.tools.r8.ir.code.Load asLoad() -> U
@@ -24200,14 +24251,14 @@
     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() -> v2
-    1:1:int maxOutValueRegister():61:61 -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():61:61 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.w.b.x0:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):20:20 -> <init>
-    com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> G2
+    com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> H2
     boolean isLogicalBinop() -> S1
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> V
     com.android.tools.r8.code.Instruction CreateInt(int,int,int) -> a
@@ -24254,27 +24305,29 @@
     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>
-    boolean throwsOnNullInput() -> A2
-    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():151:151 -> B0
-    1:1:boolean isEnter():50:50 -> B2
-    1:1:com.android.tools.r8.ir.code.Value object():46:46 -> C2
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():156:156 -> B0
+    boolean throwsOnNullInput() -> B2
+    1:1:boolean isEnter():50:50 -> C2
+    1:1:com.android.tools.r8.ir.code.Value object():46:46 -> D2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     boolean isMonitor() -> T1
+    1:1:boolean isEnter():50:50 -> U1
+    1:1:boolean isMonitorEnter():103 -> U1
     com.android.tools.r8.ir.code.Monitor asMonitor() -> W
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:71 -> a
     9:9:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):77:77 -> a
-    10:10:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):131:131 -> a
-    11:11:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):136:136 -> a
-    12:12:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):141:141 -> a
-    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
+    10:10:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):136:136 -> a
+    11:11:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):141:141 -> a
+    12:12:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):146:146 -> a
+    13:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():211:211 -> a
+    13:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):114 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int maxInValueRegister() -> v2
-    1:1:int maxOutValueRegister():87:87 -> w2
-    int opcode() -> x2
-    1:7:java.lang.String getInstructionName():114:120 -> z0
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():87:87 -> x2
+    int opcode() -> y2
+    1:7:java.lang.String getInstructionName():119:125 -> z0
 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
@@ -24286,11 +24339,11 @@
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):23:23 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value dest():37:37 -> B2
-    1:1:com.android.tools.r8.ir.code.Value src():41:41 -> C2
+    1:1:com.android.tools.r8.ir.code.Value dest():37:37 -> C2
     1:2:com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction():86:87 -> D0
+    1:1:com.android.tools.r8.ir.code.Value src():41:41 -> D2
     boolean hasInvariantOutType() -> I0
-    boolean isMove() -> U1
+    boolean isMove() -> V1
     com.android.tools.r8.ir.code.Move asMove() -> X
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):46:46 -> a
@@ -24299,23 +24352,23 @@
     4:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71:71 -> a
     5:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):108:108 -> a
     6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):118:118 -> a
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMove():216:216 -> a
+    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMove():215:215 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):103 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:boolean isOutConstant():81:81 -> e2
+    1:1:boolean isOutConstant():81:81 -> f2
     1:1:java.lang.String toString():76:76 -> toString
-    int maxInValueRegister() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.w.b.B0:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexType exceptionType -> h
     com.android.tools.r8.utils.InternalOptions options -> i
     1:1:void <clinit>():19:19 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):24:26 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getExceptionType():119:119 -> B2
+    1:1:com.android.tools.r8.graph.DexType getExceptionType():119:119 -> C2
     boolean hasInvariantOutType() -> I0
-    boolean isMoveException() -> V1
+    boolean isMoveException() -> W1
     com.android.tools.r8.ir.code.MoveException asMoveException() -> Y
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void buildCf(com.android.tools.r8.ir.conversion.CfBuilder) -> a
@@ -24323,24 +24376,24 @@
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45 -> a
     2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45:46 -> a
     4:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):62:65 -> a
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1391:1391 -> a
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1393:1393 -> a
     8:8:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):65 -> a
     9:9:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):66:66 -> a
     10:11:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):83:84 -> a
     12:12:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):95:95 -> a
     13:13:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):110:110 -> a
     14:14:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):115:115 -> a
-    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 com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():219:219 -> a
     15:15:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):90 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:int maxInValueRegister():51:51 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():51:51 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.w.b.C0:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> G2
-    boolean isMul() -> W1
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> H2
+    boolean isMul() -> X1
     com.android.tools.r8.ir.code.Mul asMul() -> Z
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -24358,13 +24411,13 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):79:79 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):94:94 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> f
-    int opcode() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.w.b.D0:
     com.android.tools.r8.ir.code.NumericType type -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):26:27 -> <init>
-    boolean isNeg() -> X1
+    boolean isNeg() -> Y1
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Unop.dest():21:21 -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55 -> a
@@ -24377,17 +24430,17 @@
     38:56:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):88:106 -> a
     57:57:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
     com.android.tools.r8.ir.code.Neg asNeg() -> a0
-    int opcode() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.w.b.E0:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexType type -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):25:26 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value size():49:49 -> B2
+    1:1:com.android.tools.r8.ir.code.Value size():49:49 -> C2
     boolean hasInvariantOutType() -> I0
     1:4:boolean instructionInstanceCanThrow():77:80 -> M0
     boolean instructionTypeCanThrow() -> N0
-    boolean isNewArrayEmpty() -> Y1
+    boolean isNewArrayEmpty() -> Z1
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):54:54 -> a
     3:3:com.android.tools.r8.ir.code.Value dest():45:45 -> a
@@ -24405,9 +24458,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() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.w.b.F0:
     long size -> i
     short[] data -> j
@@ -24415,10 +24468,9 @@
     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 -> B2
+    1:1:com.android.tools.r8.ir.code.Value src():47:47 -> C2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
-    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
@@ -24426,14 +24478,15 @@
     11:11:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):110:110 -> a
     12:20:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):120:128 -> a
     21:21:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):153:153 -> a
-    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forNewArrayFilledData():228:228 -> a
+    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forNewArrayFilledData():227:227 -> a
     22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):105 -> a
+    boolean isNewArrayFilledData() -> a2
     1:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):134:141 -> b
     boolean 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() -> v2
-    1:1:int maxOutValueRegister():83:83 -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():83:83 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.w.b.G0:
     boolean allowSpilling -> i
     boolean $assertionsDisabled -> j
@@ -24441,9 +24494,9 @@
     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 -> B2
-    1:1:boolean isSpillingAllowed():184:184 -> C2
-    1:1:void markNoSpilling():180:180 -> D2
+    1:1:com.android.tools.r8.ir.code.Value dest():47:47 -> C2
+    1:1:boolean isSpillingAllowed():184:184 -> D2
+    1:1:void markNoSpilling():180:180 -> E2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):43:43 -> a
@@ -24459,7 +24512,6 @@
     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
@@ -24471,12 +24523,13 @@
     39:39:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> b
     39:39:boolean verifyTypes(com.android.tools.r8.graph.AppView):209 -> b
     40:40:boolean verifyTypes(com.android.tools.r8.graph.AppView):209:209 -> b
+    boolean isNewInstance() -> b2
     1:11:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):189:199 -> c
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> d0
     1:1:java.lang.String toString():58:58 -> toString
-    1:1:int maxInValueRegister():68:68 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():68:68 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.w.b.H0:
     1:3:java.lang.Object nextUntil(java.util.function.Predicate):18:20 -> a
 com.android.tools.r8.ir.code.Not -> com.android.tools.r8.w.b.I0:
@@ -24494,9 +24547,9 @@
     38:38:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83:83 -> a
     39:39:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):99:99 -> a
     40:40:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):105:105 -> a
-    boolean isNot() -> b2
+    boolean isNot() -> c2
     com.android.tools.r8.ir.code.Not asNot() -> e0
-    int opcode() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.w.b.J0:
     com.android.tools.r8.ir.code.NumericType to -> i
     com.android.tools.r8.ir.code.NumericType from -> h
@@ -24525,9 +24578,9 @@
     219:219:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):157:157 -> a
     220:220:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):162:162 -> a
     221:221:boolean outTypeKnownToBeBoolean(java.util.Set):167:167 -> a
-    boolean isNumberConversion() -> c2
+    boolean isNumberConversion() -> d2
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> f0
-    int opcode() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.w.b.K0:
     com.android.tools.r8.ir.code.NumericType DOUBLE -> g
     com.android.tools.r8.ir.code.NumericType FLOAT -> f
@@ -24556,8 +24609,8 @@
     60:60:boolean isWide():62:62 -> a
 com.android.tools.r8.ir.code.Or -> com.android.tools.r8.w.b.L0:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> G2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -24569,9 +24622,9 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):63:63 -> c
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):68:68 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
-    boolean isOr() -> d2
+    boolean isOr() -> e2
     com.android.tools.r8.ir.code.Or asOr() -> g0
-    int opcode() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.w.b.M0:
     com.android.tools.r8.ir.code.Phi$RegisterReadType readType -> t
     java.util.List definitionUsers -> v
@@ -24631,7 +24684,7 @@
     127:127:void addDefinitionsUser(java.util.Map):327:327 -> a
     128:131:void lambda$verifyIsStackPhi$0(java.util.Set,com.android.tools.r8.ir.code.Value):357:360 -> a
     132:132:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):376:376 -> a
-    133:133:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():794:794 -> a
+    133:133:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():798:798 -> a
     133:133:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):376 -> a
     134:142:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):376:384 -> a
     1:3:void abortOnInvalidDebugInfo(com.android.tools.r8.ir.code.ValueTypeConstraint):83:85 -> b
@@ -24669,14 +24722,14 @@
     4:4:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):80 -> a
     5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):80:80 -> a
     6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):85:85 -> a
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forPop():240:240 -> a
+    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forPop():239:239 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):70 -> a
     1: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() -> f2
-    1:1:int maxInValueRegister():59:59 -> v2
-    1:1:int maxOutValueRegister():64:64 -> w2
-    int opcode() -> x2
+    boolean isPop() -> g2
+    1:1:int maxInValueRegister():59:59 -> w2
+    1:1:int maxOutValueRegister():64:64 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Position -> com.android.tools.r8.w.b.O0:
     com.android.tools.r8.ir.code.Position TESTING_POSITION -> h
     com.android.tools.r8.ir.code.Position NO_POSITION_SYNTHETIC -> g
@@ -24705,8 +24758,8 @@
     1:19:java.lang.String toString():151 -> toString
 com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.w.b.P0:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> G2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> H2
     1:1:boolean instructionTypeCanThrow():134:134 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -24725,17 +24778,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() -> g2
     com.android.tools.r8.ir.code.Rem asRem() -> h0
-    int opcode() -> x2
+    boolean isRem() -> h2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Return -> com.android.tools.r8.w.b.Q0:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():24:24 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.code.Value):28:28 -> <init>
-    1:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getReturnType():46:47 -> C2
-    1:1:boolean isReturnVoid():42:42 -> D2
-    1:2:com.android.tools.r8.ir.code.Value returnValue():51:52 -> E2
+    1:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getReturnType():46:47 -> D2
+    1:1:boolean isReturnVoid():42:42 -> E2
+    1:2:com.android.tools.r8.ir.code.Value returnValue():51:52 -> F2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
     2:9:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80:87 -> a
@@ -24744,18 +24797,18 @@
     13:14:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):119:120 -> a
     15:17:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):127:129 -> a
     18:18:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):126:126 -> a
-    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 com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():243:243 -> 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() -> h2
     com.android.tools.r8.ir.code.Return asReturn() -> i0
-    int maxInValueRegister() -> v2
-    1:1:int maxOutValueRegister():97:97 -> w2
-    int opcode() -> x2
+    boolean isReturn() -> i2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():97:97 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.w.b.R0:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> G2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -24767,13 +24820,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() -> i2
     com.android.tools.r8.ir.code.Shl asShl() -> j0
-    int opcode() -> x2
+    boolean isShl() -> j2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.w.b.S0:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> G2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -24785,9 +24838,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() -> j2
     com.android.tools.r8.ir.code.Shr asShr() -> k0
-    int opcode() -> x2
+    boolean isShr() -> k2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.w.b.T0:
     int decodedValue() -> a
 com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.w.b.U0:
@@ -24819,8 +24872,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 -> D2
-    1:1:com.android.tools.r8.ir.code.Value dest():49:49 -> E2
+    1:1:com.android.tools.r8.ir.code.Value value():54:54 -> E2
+    1:1:com.android.tools.r8.ir.code.Value dest():49:49 -> F2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):45:45 -> a
     2:2:com.android.tools.r8.ir.code.Value dest():49:49 -> a
@@ -24849,17 +24902,17 @@
     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() -> k2
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> l0
+    boolean isStaticGet() -> l2
     1:1:java.lang.String toString():160:160 -> toString
-    int maxInValueRegister() -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.w.b.X0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():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
+    1:2:com.android.tools.r8.ir.code.Value value():54:55 -> E2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):49:49 -> a
     2:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):61:88 -> a
@@ -24888,17 +24941,17 @@
     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
+    boolean isStaticPut() -> m2
     1:1:java.lang.String toString():231:231 -> toString
-    int maxInValueRegister() -> v2
-    1:1:int maxOutValueRegister():190:190 -> w2
-    int opcode() -> x2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():190:190 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Store -> com.android.tools.r8.w.b.Y0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.StackValue):23:23 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value src():37:37 -> B2
+    1:1:com.android.tools.r8.ir.code.Value src():37:37 -> C2
     boolean hasInvariantOutType() -> I0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):52:52 -> a
@@ -24908,21 +24961,21 @@
     5:5:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):88:88 -> a
     6:6:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):93:93 -> a
     7:7:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):103:103 -> a
-    8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStore():260:260 -> a
+    8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStore():259:259 -> a
     8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):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() -> m2
     com.android.tools.r8.ir.code.Store asStore() -> n0
-    1:1:int maxInValueRegister():57:57 -> v2
-    int maxOutValueRegister() -> w2
-    int opcode() -> x2
+    boolean isStore() -> n2
+    1:1:int maxInValueRegister():57:57 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.w.b.Z0:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexString[] keys -> l
     1:1:void <clinit>():15:15 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexString[],int[],int):21:23 -> <init>
-    1:4:boolean valid():44:47 -> F2
+    1:4:boolean valid():44:47 -> G2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:void forEachCase(java.util.function.BiConsumer):37:37 -> a
     2:2:com.android.tools.r8.graph.DexString getKey(int):62:62 -> a
@@ -24932,22 +24985,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() -> n2
     com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> o0
+    boolean isStringSwitch() -> o2
     1:4:java.lang.String toString():67:70 -> toString
     5:5:com.android.tools.r8.graph.DexString getKey(int):62:62 -> toString
     5:5:java.lang.String toString():71 -> toString
     6:11:java.lang.String toString():71:76 -> toString
-    1:1:int maxInValueRegister():101:101 -> v2
-    1:1:int maxOutValueRegister():106:106 -> w2
-    int opcode() -> x2
+    1:1:int maxInValueRegister():101:101 -> w2
+    1:1:int maxOutValueRegister():106:106 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.w.b.a1:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):27:27 -> <init>
-    boolean isCommutative() -> C2
-    1:8:int maxInOutValueRegisterSize():131:138 -> E2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> G2
+    boolean isCommutative() -> D2
+    1:8:int maxInOutValueRegisterSize():131:138 -> F2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
@@ -24971,9 +25024,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() -> o2
     com.android.tools.r8.ir.code.Sub asSub() -> p0
-    int opcode() -> x2
+    boolean isSub() -> p2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.w.b.b1:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():19:19 -> <clinit>
@@ -24985,31 +25038,31 @@
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:67 -> a
     2:2:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):72:72 -> a
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):77:77 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forSwap():264:264 -> a
+    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forSwap():263:263 -> 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):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() -> p2
-    int maxInValueRegister() -> v2
-    1:1:int maxOutValueRegister():87:87 -> w2
-    int opcode() -> x2
+    boolean isSwap() -> q2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():87:87 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.w.b.c1:
     int[] targetBlockIndices -> i
     int fallthroughBlockIndex -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():9:9 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,int[],int):15:17 -> <init>
-    1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():51:51 -> 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:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():51:51 -> C2
+    1:1:int getFallthroughBlockIndex():55:55 -> D2
+    1:1:int numberOfKeys():68:68 -> E2
+    1:1:int[] targetBlockIndices():40:40 -> F2
+    1:2:boolean valid():25:26 -> G2
+    3:3:int getTargetBlockIndex(int):36:36 -> G2
+    3:3:boolean valid():26 -> G2
+    4:4:int getFallthroughBlockIndex():55:55 -> G2
+    4:4:boolean valid():26 -> G2
+    5:5:boolean valid():26:26 -> G2
+    1:1:com.android.tools.r8.ir.code.Value value():21:21 -> H2
     1:1:int getTargetBlockIndex(int):36:36 -> b
     2:2:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):64:64 -> b
     1:1:void setFallthroughBlockIndex(int):59:59 -> c
@@ -25018,12 +25071,12 @@
     2:2:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):32 -> d
     3:3:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):32:32 -> d
     com.android.tools.r8.ir.code.Switch asSwitch() -> q0
-    boolean isSwitch() -> q2
+    boolean isSwitch() -> r2
 com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.w.b.d1:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value exception():34:34 -> C2
+    1:1:com.android.tools.r8.ir.code.Value exception():34:34 -> D2
     boolean instructionTypeCanThrow() -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):39:39 -> a
@@ -25034,29 +25087,29 @@
     10:10:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
     10:10:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):99 -> a
     11: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 com.android.tools.r8.ir.optimize.InliningConstraints.forThrow():267:267 -> a
     16:16:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):76 -> a
     com.android.tools.r8.ir.code.Throw asThrow() -> r0
-    boolean isThrow() -> r2
-    int maxInValueRegister() -> v2
-    1:1:int maxOutValueRegister():49:49 -> w2
-    int opcode() -> x2
+    boolean isThrow() -> s2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():49:49 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.w.b.e1:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value source():25:25 -> B2
+    1:1:com.android.tools.r8.ir.code.Value source():25:25 -> C2
     boolean hasInvariantOutType() -> I0
     1:2:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):56:57 -> a
     3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):62:62 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():272:272 -> a
+    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():271:271 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):51 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isUnop() -> s2
-    int maxInValueRegister() -> v2
-    int maxOutValueRegister() -> w2
+    boolean isUnop() -> t2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
 com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.w.b.f1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> G2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -25069,8 +25122,8 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):58:58 -> d
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
     com.android.tools.r8.ir.code.Ushr asUshr() -> s0
-    boolean isUshr() -> t2
-    int opcode() -> x2
+    boolean isUshr() -> u2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Value -> com.android.tools.r8.w.b.g1:
     int needsRegister -> j
     boolean isThis -> k
@@ -25092,37 +25145,37 @@
     1:165:void <clinit>():40:204 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):223:223 -> <init>
     2:20:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):208:226 -> <init>
-    1:1:boolean isConstClass():823:823 -> A
-    1:1:boolean isConstNumber():803:803 -> B
-    1:1:boolean isConstString():807:807 -> C
-    1:1:boolean isConstant():827:827 -> D
-    1:1:boolean isDexItemBasedConstString():811:811 -> E
+    1:1:boolean isConstClass():827:827 -> A
+    1:1:boolean isConstNumber():807:807 -> B
+    1:1:boolean isConstString():811:811 -> C
+    1:1:boolean isConstant():831:831 -> D
+    1:1:boolean isDexItemBasedConstString():815:815 -> E
     boolean isFixedRegisterValue() -> F
-    1:1:boolean isLinked():388:388 -> G
-    1:3:boolean isNeverNull():987:989 -> H
+    1:1:boolean isLinked():392:392 -> G
+    1:3:boolean isNeverNull():991:993 -> H
     boolean isPhi() -> I
-    1:1:boolean isThis():1050:1050 -> J
-    1:1:boolean isUsed():489:489 -> K
+    1:1:boolean isThis():1063:1063 -> J
+    1:1:boolean isUsed():493:493 -> K
     boolean isValueOnStack() -> L
-    1:3:boolean isZero():1143:1145 -> M
-    1:3:void markAsArgument():998:1000 -> N
-    1:3:void markAsThis():1039:1041 -> O
+    1:3:boolean isZero():1156:1158 -> M
+    1:3:void markAsArgument():997:999 -> N
+    1:3:void markAsThis():1052:1054 -> O
     1:1:void markNonDebugLocalRead():137:137 -> P
-    1:3:boolean needsRegister():715:717 -> Q
-    1:1:int numberOfAllNonDebugUsers():477:477 -> R
-    1:1:int numberOfAllUsers():485 -> R
-    2:2:int numberOfAllUsers():485:485 -> R
-    1:1:int numberOfDebugUsers():481:481 -> S
-    1:5:int numberOfPhiUsers():469:473 -> T
-    1:5:int numberOfUsers():461:465 -> U
-    1:1:com.android.tools.r8.ir.code.ValueType outType():794:794 -> V
-    1:1:int requiredRegisters():291:291 -> W
-    1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():424:425 -> X
-    1:4:java.util.Set uniquePhiUsers():450:453 -> Y
-    1:4:java.util.Set uniqueUsers():417:420 -> Z
+    1:3:boolean needsRegister():719:721 -> Q
+    1:1:int numberOfAllNonDebugUsers():481:481 -> R
+    1:1:int numberOfAllUsers():489 -> R
+    2:2:int numberOfAllUsers():489:489 -> R
+    1:1:int numberOfDebugUsers():485:485 -> S
+    1:5:int numberOfPhiUsers():473:477 -> T
+    1:5:int numberOfUsers():465:469 -> U
+    1:1:com.android.tools.r8.ir.code.ValueType outType():798:798 -> V
+    1:1:int requiredRegisters():295:295 -> W
+    1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():428:429 -> X
+    1:4:java.util.Set uniquePhiUsers():454:457 -> Y
+    1:4:java.util.Set uniqueUsers():421:424 -> Z
     boolean lambda$fullyRemovePhiUser$1(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi) -> a
     1:13:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.Reporter):44:56 -> a
-    14:14:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1154:1154 -> a
+    14:14:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167:1167 -> a
     14:14:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.Reporter):57 -> a
     15:15:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.Reporter):46:46 -> a
     16:18:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
@@ -25139,109 +25192,116 @@
     117:117:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):128:128 -> a
     118:118:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueTypeConstraint):132:132 -> a
     118:118:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):128 -> a
-    119:139:com.android.tools.r8.ir.code.Value getAliasedValue(java.util.function.Predicate):257:277 -> a
-    140:142:void setLocalInfo(com.android.tools.r8.graph.DebugLocalInfo):303:305 -> a
-    143:146:boolean hasSameOrNoLocal(com.android.tools.r8.ir.code.Value):314:317 -> a
-    147:148:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):357:358 -> a
-    149:150:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):362:363 -> a
-    149:150:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):358 -> a
+    119:139:com.android.tools.r8.ir.code.Value getAliasedValue(java.util.function.Predicate):261:281 -> a
+    140:142:void setLocalInfo(com.android.tools.r8.graph.DebugLocalInfo):307:309 -> a
+    143:146:boolean hasSameOrNoLocal(com.android.tools.r8.ir.code.Value):318:321 -> a
+    147:148:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):361:362 -> a
+    149:150:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):366:367 -> a
+    149:150:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362 -> a
     151:159:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():172:180 -> a
-    151:159:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):363 -> a
-    151:159:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):358 -> a
+    151:159:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):367 -> a
+    151:159:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362 -> a
     160:160:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():178:178 -> a
-    160:160:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):363 -> a
-    160:160:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):358 -> a
+    160:160:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):367 -> a
+    160:160:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362 -> a
     161:161:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():175:175 -> a
-    161:161:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):363 -> a
-    161:161:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):358 -> a
-    162:162:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):358:358 -> a
-    163:164:boolean onlyUsedInBlock(com.android.tools.r8.ir.code.BasicBlock):408:409 -> a
-    165:168:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):436:439 -> a
-    169:170:void addPhiUser(com.android.tools.r8.ir.code.Phi):555:556 -> a
-    171:178:java.util.Set affectedValues():606:613 -> a
-    179:206:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):645:672 -> a
-    207:216:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):679:688 -> a
+    161:161:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):367 -> a
+    161:161:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362 -> a
+    162:162:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362:362 -> a
+    163:164:boolean onlyUsedInBlock(com.android.tools.r8.ir.code.BasicBlock):412:413 -> a
+    165:168:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):440:443 -> a
+    169:170:void addPhiUser(com.android.tools.r8.ir.code.Phi):559:560 -> a
+    171:178:java.util.Set affectedValues():610:617 -> a
+    179:206:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):649:676 -> a
+    207:216:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):683:692 -> a
     217:230:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.join(com.android.tools.r8.ir.code.Value$DebugUse,com.android.tools.r8.ir.code.Value$DebugUse):185:198 -> a
-    217:230:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):688 -> a
+    217:230:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):692 -> a
     231:231:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.join(com.android.tools.r8.ir.code.Value$DebugUse,com.android.tools.r8.ir.code.Value$DebugUse):186:186 -> a
-    231:231:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):688 -> a
-    232:232:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):688:688 -> a
-    233:241:void replaceDebugUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):693:701 -> a
-    242:243:void setLiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):706:707 -> a
-    244:245:void setNeedsRegister(boolean):721:722 -> a
-    246:258:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):831:843 -> a
+    231:231:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):692 -> a
+    232:232:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):692:692 -> a
+    233:241:void replaceDebugUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):697:705 -> a
+    242:243:void setLiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):710:711 -> a
+    244:245:void setNeedsRegister(boolean):725:726 -> a
+    246:258:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):835:847 -> a
     259:259:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    259:259:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):844 -> a
-    260:261:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):844:845 -> a
+    259:259:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):848 -> a
+    260:261:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):848:849 -> a
     262:262:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    262:262:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):849 -> a
-    263:381:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):849:967 -> a
-    382:404:boolean knownToBeBoolean(java.util.Set):1013:1035 -> a
-    405:405:void setValueRange(com.android.tools.r8.utils.LongInterval):1054:1054 -> a
-    406:406:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate):1091:1091 -> a
-    407:434:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1108:1135 -> a
-    435:435:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1154:1154 -> a
-    436:438:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1173:1175 -> a
-    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):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):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
+    262:262:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):853 -> a
+    263:381:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):853:971 -> a
+    382:393:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):1007:1018 -> a
+    394:416:boolean knownToBeBoolean(java.util.Set):1026:1048 -> a
+    417:417:void setValueRange(com.android.tools.r8.utils.LongInterval):1067:1067 -> a
+    418:418:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate):1104:1104 -> a
+    419:446:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1121:1148 -> a
+    447:447:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167:1167 -> a
+    448:450:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1186:1188 -> a
+    451:459:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1186:1194 -> a
+    460:460:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167:1167 -> a
+    460:460:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1195 -> a
+    461:467:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1235:1241 -> a
+    468:468:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    468:468:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1242 -> a
+    469:480:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1243:1254 -> a
+    481:481:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
+    481:481:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1254 -> a
+    482:483:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1254:1255 -> a
+    1:2:boolean usedInMonitorOperation():525:526 -> a0
     boolean lambda$fullyRemoveUser$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> b
-    1:2:com.android.tools.r8.ir.code.Value getSpecificAliasedValue(java.util.function.Predicate):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: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
+    1:2:com.android.tools.r8.ir.code.Value getSpecificAliasedValue(java.util.function.Predicate):286:287 -> b
+    3:6:void linkTo(com.android.tools.r8.ir.code.Value):371:374 -> b
+    7:8:java.util.Set aliasedUsers():433:434 -> b
+    9:10:void removePhiUser(com.android.tools.r8.ir.code.Phi):564:565 -> b
+    11:12:void addDebugUser(com.android.tools.r8.ir.code.Instruction):574:575 -> b
+    13:13:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):1099:1099 -> b
+    14:20:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1173:1179 -> b
+    21:21:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167:1167 -> b
+    21:21:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1180 -> b
+    22:40:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1206:1224 -> b
+    41:41:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> b
+    41:41:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1224 -> b
+    42:46:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1224:1228 -> b
     com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue() -> c
-    1:5:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):493:497 -> c
+    1:5:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):497:501 -> c
     6:6:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> c
-    6:6:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):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
+    6:6:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):501 -> c
+    7:11:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):504:508 -> c
+    12:16:boolean mayDependOnEnvironment(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):514:518 -> c
+    17:18:void addUser(com.android.tools.r8.ir.code.Instruction):534:535 -> c
+    19:20:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):569:570 -> c
+    21:33:void replaceUsers(com.android.tools.r8.ir.code.Value):624:636 -> c
     com.android.tools.r8.ir.code.Phi asPhi() -> d
-    1:5:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):583:587 -> d
-    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
+    1:5:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):587:591 -> d
+    6:6:boolean lambda$getDynamicLowerBoundType$4(com.android.tools.r8.ir.code.Value):1250:1250 -> d
+    1:2:void removeUser(com.android.tools.r8.ir.code.Instruction):539:540 -> e
+    3:8:void clearUsers():549:554 -> e
+    9:9:boolean lambda$getDynamicUpperBoundType$3(com.android.tools.r8.ir.code.Value):1207:1207 -> e
     boolean lambda$replaceSelectiveUsers$2(com.android.tools.r8.ir.code.Value) -> f
-    1:2:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):540:541 -> f
-    3:8:void clearUsersInfo():595:600 -> f
-    1:2:void computeNeedsRegister():726:727 -> g
-    1:1:java.util.Set debugUsers():457:457 -> h
-    1:1:int hashCode():760:760 -> hashCode
-    1:2:com.android.tools.r8.ir.code.Phi firstPhiUser():445:446 -> i
-    1:1:com.android.tools.r8.ir.code.Value getAliasedValue():253:253 -> j
-    1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():798:799 -> k
-    1:7:java.util.List getDebugLocalEnds():334:340 -> l
-    1:7:java.util.List getDebugLocalStarts():321:327 -> m
+    1:2:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):544:545 -> f
+    3:8:void clearUsersInfo():599:604 -> f
+    1:2:void computeNeedsRegister():730:731 -> g
+    1:1:java.util.Set debugUsers():461:461 -> h
+    1:1:int hashCode():764:764 -> hashCode
+    1:2:com.android.tools.r8.ir.code.Phi firstPhiUser():449:450 -> i
+    1:1:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> j
+    1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():802:803 -> k
+    1:7:java.util.List getDebugLocalEnds():338:344 -> l
+    1:7:java.util.List getDebugLocalStarts():325:331 -> m
     1:2:com.android.tools.r8.ir.code.Instruction getDefinition():238:239 -> n
-    1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():711:711 -> o
-    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():295:295 -> p
-    1:1:com.android.tools.r8.ir.code.Value getNextConsecutive():400:400 -> q
-    1:1:int getNumber():287:287 -> r
-    1:1:com.android.tools.r8.ir.code.Value getPreviousConsecutive():404:404 -> s
-    1:1:com.android.tools.r8.ir.code.Value getStartOfConsecutive():393 -> s
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice():1186:1186 -> t
-    1:26:java.lang.String toString():765:790 -> toString
-    1:11:com.android.tools.r8.utils.LongInterval getValueRange():1070:1080 -> u
-    1:1:boolean hasLocalInfo():299:299 -> v
-    1:1:boolean hasUsersInfo():591:591 -> w
-    1:1:boolean hasValueRange():1058:1058 -> x
-    1:8:boolean internalComputeNeedsRegister():731:738 -> y
-    1:1:boolean isArgument():1004:1004 -> z
+    1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():715:715 -> o
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():299:299 -> p
+    1:1:com.android.tools.r8.ir.code.Value getNextConsecutive():404:404 -> q
+    1:1:int getNumber():291:291 -> r
+    1:1:com.android.tools.r8.ir.code.Value getPreviousConsecutive():408:408 -> s
+    1:1:com.android.tools.r8.ir.code.Value getStartOfConsecutive():397 -> s
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice():1199:1199 -> t
+    1:26:java.lang.String toString():769:794 -> toString
+    1:11:com.android.tools.r8.utils.LongInterval getValueRange():1083:1093 -> u
+    1:1:boolean hasLocalInfo():303:303 -> v
+    1:1:boolean hasUsersInfo():595:595 -> w
+    1:1:boolean hasValueRange():1071:1071 -> x
+    1:8:boolean internalComputeNeedsRegister():735:742 -> y
+    1:1:boolean isArgument():1003:1003 -> z
 com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.w.b.g1$a:
     java.util.Map users -> b
     com.android.tools.r8.graph.DebugLocalInfo local -> a
@@ -25345,8 +25405,8 @@
     long decodedValue() -> a
 com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.w.b.l1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
-    boolean isCommutative() -> C2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> G2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -25359,8 +25419,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() -> u2
-    int opcode() -> x2
+    boolean isXor() -> v2
+    int opcode() -> y2
 com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver -> com.android.tools.r8.w.c.c:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
@@ -25448,53 +25508,53 @@
     int maxDepth -> h
     int currentDepth -> g
     java.util.Map removedEdges -> f
-    1:1:void <clinit>():294:294 -> <clinit>
-    1:1:void <init>(java.util.Collection,com.android.tools.r8.utils.InternalOptions):353:353 -> <init>
-    2:23:void <init>(java.util.Collection,com.android.tools.r8.utils.InternalOptions):339:360 -> <init>
-    1:8:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult breakCycles():365:372 -> a
-    9:14:void reset():379:384 -> a
-    9:14:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult breakCycles():374 -> a
-    15:15:boolean edgeRemovalIsSafe(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):531:531 -> a
-    16:16:void recordEdgeRemoval(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):535:535 -> a
-    17:19:java.util.Collection reorderNodes(java.util.List):546:548 -> a
-    1:1:java.util.Set lambda$recordEdgeRemoval$0(com.android.tools.r8.ir.conversion.CallGraph$Node):535:535 -> b
-    1:7:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):388:394 -> c
-    8:10:void push(com.android.tools.r8.ir.conversion.CallGraph$Node):491:493 -> c
-    8:10:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):399 -> c
-    11:91:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):403:483 -> c
-    92:110:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):423:441 -> c
-    111:118:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):437:444 -> c
-    119:123:java.util.LinkedList extractCycle(com.android.tools.r8.ir.conversion.CallGraph$Node):504:508 -> c
-    119:123:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):447 -> c
-    124:125:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):449:450 -> c
-    126:134:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):513:521 -> c
-    126:134:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):456 -> c
-    135:147:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):461:473 -> c
-    148:148:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):468:468 -> c
-    149:151:void recoverStack(java.util.LinkedList):539:541 -> c
-    149:151:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):478 -> c
-    152:152:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):525:525 -> c
-    152:152:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):456 -> c
+    1:1:void <clinit>():302:302 -> <clinit>
+    1:1:void <init>(java.util.Collection,com.android.tools.r8.utils.InternalOptions):361:361 -> <init>
+    2:23:void <init>(java.util.Collection,com.android.tools.r8.utils.InternalOptions):347:368 -> <init>
+    1:8:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult breakCycles():373:380 -> a
+    9:14:void reset():387:392 -> a
+    9:14:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult breakCycles():382 -> a
+    15:15:boolean edgeRemovalIsSafe(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):539:539 -> a
+    16:16:void recordEdgeRemoval(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):543:543 -> a
+    17:19:java.util.Collection reorderNodes(java.util.List):554:556 -> a
+    1:1:java.util.Set lambda$recordEdgeRemoval$0(com.android.tools.r8.ir.conversion.CallGraph$Node):543:543 -> b
+    1:7:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):396:402 -> c
+    8:10:void push(com.android.tools.r8.ir.conversion.CallGraph$Node):499:501 -> c
+    8:10:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):407 -> c
+    11:91:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):411:491 -> c
+    92:110:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):431:449 -> c
+    111:118:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):445:452 -> c
+    119:123:java.util.LinkedList extractCycle(com.android.tools.r8.ir.conversion.CallGraph$Node):512:516 -> c
+    119:123:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):455 -> c
+    124:125:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):457:458 -> c
+    126:134:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):521:529 -> c
+    126:134:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):464 -> c
+    135:147:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):469:481 -> c
+    148:148:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):476:476 -> c
+    149:151:void recoverStack(java.util.LinkedList):547:549 -> c
+    149:151:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):486 -> c
+    152:152:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):533:533 -> c
+    152:152:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):464 -> c
     153:153:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> c
-    153:153:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):525 -> c
-    153:153:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):456 -> c
-    154:154:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):525:525 -> c
-    154:154:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):456 -> c
-    155:158:void pop(com.android.tools.r8.ir.conversion.CallGraph$Node):497:500 -> c
-    155:158:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):486 -> c
-    159:159:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):487:487 -> c
+    153:153:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):533 -> c
+    153:153:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):464 -> c
+    154:154:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):533:533 -> c
+    154:154:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):464 -> c
+    155:158:void pop(com.android.tools.r8.ir.conversion.CallGraph$Node):505:508 -> c
+    155:158:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):494 -> c
+    159:159:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):495:495 -> c
 com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge -> com.android.tools.r8.w.c.e$a$a:
     com.android.tools.r8.ir.conversion.CallGraph$Node callee -> b
     com.android.tools.r8.ir.conversion.CallGraph$Node caller -> a
-    1:3:void <init>(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):304:306 -> <init>
-    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$300(com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge):299:299 -> a
-    2:2:void remove():310:310 -> a
-    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$400(com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge):299:299 -> b
+    1:3:void <init>(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):312:314 -> <init>
+    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$300(com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge):307:307 -> a
+    2:2:void remove():318:318 -> a
+    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$400(com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge):307:307 -> b
 com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult -> com.android.tools.r8.w.c.e$a$b:
     java.util.Map removedEdges -> a
-    1:2:void <init>(java.util.Map):318:319 -> <init>
-    1:1:void forEachRemovedCaller(com.android.tools.r8.ir.conversion.CallGraph$Node,java.util.function.Consumer):323:323 -> a
-    2:3:int numberOfRemovedEdges():328:329 -> a
+    1:2:void <init>(java.util.Map):326:327 -> <init>
+    1:1:void forEachRemovedCaller(com.android.tools.r8.ir.conversion.CallGraph$Node,java.util.function.Consumer):331:331 -> a
+    2:3:int numberOfRemovedEdges():336:337 -> a
 com.android.tools.r8.ir.conversion.CallGraphBuilder$InvokeExtractor -> com.android.tools.r8.w.c.f:
     com.android.tools.r8.ir.conversion.CallGraph$Node caller -> a
     com.android.tools.r8.ir.conversion.CallGraphBuilder this$0 -> b
@@ -25506,33 +25566,33 @@
     6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
     6:6:void addClassInitializerTarget(com.android.tools.r8.graph.DexType):130 -> a
     7:7:void addClassInitializerTarget(com.android.tools.r8.graph.DexType):132:132 -> a
-    8:10:void addTarget(com.android.tools.r8.graph.DexEncodedMethod,boolean):137:139 -> a
-    11:26:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):144:159 -> a
-    27:27:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    27:27:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):159 -> a
-    28:34:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):160:166 -> a
-    35:36:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):152:153 -> a
-    37:37:void lambda$processInvoke$0(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):153:153 -> a
-    38:41:java.util.Set lambda$processInvokeWithDynamicDispatch$1(boolean,com.android.tools.r8.graph.DexMethod):192:195 -> a
-    42:43:void processFieldAccess(com.android.tools.r8.graph.DexField):212:213 -> a
-    44:44:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():115:115 -> a
-    44:44:void processFieldAccess(com.android.tools.r8.graph.DexField):214 -> a
-    45:45:void processFieldAccess(com.android.tools.r8.graph.DexField):215:215 -> a
-    1:2:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):173:174 -> b
+    8:19:void addTarget(com.android.tools.r8.graph.DexEncodedMethod,boolean):137:148 -> a
+    20:35:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):152:167 -> a
+    36:36:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    36:36:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):167 -> a
+    37:43:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):168:174 -> a
+    44:45:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):160:161 -> a
+    46:46:void lambda$processInvoke$0(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):161:161 -> a
+    47:50:java.util.Set lambda$processInvokeWithDynamicDispatch$1(boolean,com.android.tools.r8.graph.DexMethod):200:203 -> a
+    51:52:void processFieldAccess(com.android.tools.r8.graph.DexField):220:221 -> a
+    53:53:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():114:114 -> a
+    53:53:void processFieldAccess(com.android.tools.r8.graph.DexField):222 -> a
+    54:54:void processFieldAccess(com.android.tools.r8.graph.DexField):223:223 -> a
+    1:2:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):181:182 -> b
     3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> b
-    3:3:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):174 -> b
-    4:32:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):176:204 -> b
-    1:1:void registerCallSite(com.android.tools.r8.graph.DexCallSite):289:289 -> registerCallSite
-    1:1:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):258:258 -> registerInstanceFieldRead
-    1:1:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):252:252 -> registerInstanceFieldWrite
-    1:1:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):228:228 -> registerInvokeDirect
-    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):240:240 -> registerInvokeInterface
-    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):234:234 -> registerInvokeStatic
-    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):246:246 -> registerInvokeSuper
-    1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):222:222 -> registerInvokeVirtual
-    1:2:boolean registerNewInstance(com.android.tools.r8.graph.DexType):264:265 -> registerNewInstance
-    1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):272:272 -> registerStaticFieldRead
-    1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):278:278 -> registerStaticFieldWrite
+    3:3:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):182 -> b
+    4:32:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):184:212 -> b
+    1:1:void registerCallSite(com.android.tools.r8.graph.DexCallSite):297:297 -> registerCallSite
+    1:1:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):266:266 -> registerInstanceFieldRead
+    1:1:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):260:260 -> registerInstanceFieldWrite
+    1:1:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):236:236 -> registerInvokeDirect
+    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):248:248 -> registerInvokeInterface
+    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):242:242 -> registerInvokeStatic
+    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):254:254 -> registerInvokeSuper
+    1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):230:230 -> registerInvokeVirtual
+    1:2:boolean registerNewInstance(com.android.tools.r8.graph.DexType):272:273 -> registerNewInstance
+    1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):280:280 -> registerStaticFieldRead
+    1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):286:286 -> registerStaticFieldWrite
 com.android.tools.r8.ir.conversion.CallSiteInformation -> com.android.tools.r8.w.c.i:
     1:1:void <init>():14:14 -> <init>
     boolean hasDoubleCallSite(com.android.tools.r8.graph.DexMethod) -> a
@@ -25580,7 +25640,7 @@
     21:23:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):133:135 -> a
     24:36:void rewriteNots():222:234 -> a
     24:36:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
-    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     37:37:void rewriteNots():234 -> a
     37:37:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
     38:46:void rewriteNots():235:243 -> a
@@ -25737,7 +25797,7 @@
     1:1:int instructionCount():260:260 -> a
     2:6:boolean canThrowHelper(com.android.tools.r8.cf.code.CfInstruction):288:292 -> a
     7:9:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):297:299 -> a
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     10:10:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299 -> a
     11:12:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299:300 -> a
     13:39:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299:325 -> a
@@ -26058,7 +26118,7 @@
     109:109:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):587:587 -> a
     109:109:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):427 -> a
     110:123:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):429:442 -> a
-    124:124:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    124:124:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     124:124:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):443 -> a
     125:154:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):445:474 -> a
     155:166:void rewriteIfs():490:501 -> a
@@ -26074,7 +26134,7 @@
     180:183:void reset():165:168 -> a
     180:183:com.android.tools.r8.graph.DexCode build():191 -> a
     184:225:com.android.tools.r8.graph.DexCode build():196:237 -> a
-    226:226:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():1327:1327 -> a
+    226:226:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():1329:1329 -> a
     226:226:com.android.tools.r8.graph.DexCode build():237 -> a
     227:270:com.android.tools.r8.graph.DexCode build():238:281 -> a
     271:290:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):714:733 -> a
@@ -26620,7 +26680,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():1478:1478 -> a
+    205:205:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
     205:205:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):574 -> a
     206:208:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):575:577 -> a
     209:209:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
@@ -26631,14 +26691,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():1478:1478 -> a
+    250:250:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
     250:250:void joinPredecessorsWithIdenticalPhis():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):499:510 -> a
+    267:278:void com.android.tools.r8.ir.code.BasicBlock.removePredecessorsByIndex(java.util.List):506:517 -> 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
@@ -26651,14 +26711,14 @@
     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):1013:1013 -> a
+    335:335:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder):1085:1085 -> a
     335:335:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):610 -> a
     336:344:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):611:619 -> a
     345:345:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     345:345:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):619 -> a
     346:346:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):619:619 -> a
     347:360:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):616:629 -> a
-    361:361:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1074:1074 -> a
+    361:361:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1076:1076 -> a
     361:361:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):629 -> a
     362:362:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630:630 -> a
     363:374:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):124:135 -> a
@@ -26712,7 +26772,7 @@
     427:427:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo):916 -> a
     428:431:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo):917:920 -> a
     432:436:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):958:962 -> a
-    437:437:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():575:575 -> a
+    437:437:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():579:579 -> a
     437:437:boolean isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):934 -> a
     437:437:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):963 -> a
     438:438:boolean isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):934:934 -> a
@@ -26753,7 +26813,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():330:330 -> a
+    556:556:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     556:556:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141 -> a
     556:556:void addConstString(int,com.android.tools.r8.graph.DexString):1149 -> a
     557:558:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1142:1143 -> a
@@ -26762,7 +26822,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():330:330 -> a
+    564:564:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     564:564:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141 -> a
     564:564:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1158 -> a
     565:566:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1142:1143 -> a
@@ -26916,7 +26976,7 @@
     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:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():579:579 -> a
     999:999:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1981 -> a
     1000:1010:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1982:1992 -> a
     1011:1015:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1990:1994 -> a
@@ -27029,7 +27089,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():330:330 -> b
+    60:60:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> b
     60:60:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531 -> b
     61:67:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531:1537 -> b
     68:74:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1664:1670 -> b
@@ -27377,15 +27437,16 @@
     1:1:com.android.tools.r8.ir.code.BasicBlock access$100(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):181:181 -> a
     1:1:int access$400(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):181:181 -> b
 com.android.tools.r8.ir.conversion.IRConverter -> com.android.tools.r8.w.c.N:
+    java.util.List neverMergePrefixes -> Q
     com.android.tools.r8.graph.AppView appView -> a
-    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.info.OptimizationFeedback simpleOptimizationFeedback -> M
+    com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed delayedOptimizationFeedback -> M
     com.android.tools.r8.ir.optimize.ConstantCanonicalizer constantCanonicalizer -> v
-    boolean seenNeverMergePrefix -> R
+    boolean seenNotNeverMergePrefix -> R
     com.android.tools.r8.ir.optimize.Inliner inliner -> y
+    boolean $assertionsDisabled -> T
     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
@@ -27397,367 +27458,333 @@
     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.optimize.info.MethodOptimizationInfoCollector methodOptimizationInfoCollector -> L
     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.naming.IdentifierNameStringMarker identifierNameStringMarker -> z
+    com.android.tools.r8.graph.DexString highestSortingString -> O
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner classInliner -> q
     com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer covariantReturnTypeAnnotationTransformer -> B
-    java.util.List neverMergePrefixes -> P
+    java.util.List onWaveDoneActions -> P
     com.android.tools.r8.ir.optimize.MemberValuePropagation memberValuePropagation -> w
     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 seenNotNeverMergePrefix -> Q
-    boolean $assertionsDisabled -> S
     com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> k
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter interfaceMethodRewriter -> m
+    boolean seenNeverMergePrefix -> S
     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.info.OptimizationFeedback simpleOptimizationFeedback -> N
     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
-    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):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:void <clinit>():119:119 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):185:185 -> <init>
+    2:170:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):168:336 -> <init>
+    171:171:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):349:349 -> <init>
+    boolean lambda$materializeInstructionBeforeLongOperationsWorkaround$20(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
     1:1:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    1:1:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):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
+    1:1:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):685 -> a
+    2:2:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):685:685 -> a
+    3:3:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):681:681 -> a
+    4:4:java.lang.String lambda$new$0(java.lang.String):205:205 -> a
+    5:8:java.util.Set getDesugaredCallSites():340:343 -> a
+    9:16:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):444:451 -> a
+    17:18:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):384:385 -> a
+    17:18:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):453 -> a
+    19:21:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):391:393 -> a
+    19:21:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):454 -> a
+    22:22:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):455:455 -> a
+    23:24:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):415:416 -> a
+    23:24:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):455 -> a
+    25:26:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):424:425 -> a
+    25:26:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):456 -> a
+    27:28:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):431:432 -> a
+    27:28:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):457 -> a
+    29:30:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):437:438 -> a
+    29:30:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):458 -> a
+    31:32:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):901:902 -> a
+    31:32:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):459 -> a
+    33:36:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):461:464 -> a
+    37:43:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):468:474 -> a
+    44:45:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):499:500 -> a
+    44:45:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):475 -> a
     46:53:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithout(com.android.tools.r8.graph.DexType):102:109 -> a
-    46:53:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):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
+    46:53:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):501 -> a
+    46:53:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):475 -> a
+    54:54:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):501:501 -> a
+    54:54:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):475 -> a
+    55:59:void convertClasses(java.lang.Iterable,java.util.concurrent.ExecutorService):537:541 -> a
+    60:62:void lambda$convertMethods$4(boolean,com.android.tools.r8.graph.DexEncodedMethod):556:558 -> a
+    63:71:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):622:630 -> a
+    72:73:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):881:882 -> a
+    72:73:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):631 -> a
+    74:75:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):405:406 -> a
+    74:75:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):632 -> a
+    76:84:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):641:649 -> a
     85:85:com.android.tools.r8.ir.conversion.CallGraphBuilder com.android.tools.r8.ir.conversion.CallGraph.builder(com.android.tools.r8.graph.AppView):156:156 -> a
     85:85:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):170 -> a
-    85:85:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):654 -> a
+    85:85:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):649 -> a
     86:87:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):170:171 -> a
-    86:87:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):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
+    86:87:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):649 -> a
+    88:139:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):650:701 -> a
+    140:140:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    140:140:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):701 -> a
+    141:141:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):702:702 -> a
+    142:143:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):399:400 -> a
+    142:143:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):703 -> a
+    144:147:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):707:710 -> a
+    148:150:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):391:393 -> a
+    148:150:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):711 -> a
+    151:152:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):713:714 -> a
+    153:154:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):415:416 -> a
+    153:154:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):714 -> a
+    155:155:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):716:716 -> a
+    156:157:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):424:425 -> a
+    156:157:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):717 -> a
+    158:159:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):431:432 -> a
+    158:159:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):718 -> a
+    160:162:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):719:721 -> a
+    163:164:void finalizeLambdaMerging(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):892:893 -> a
+    163:164:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):722 -> a
+    165:165:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):724:724 -> a
+    166:167:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):901:902 -> a
+    166:167:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):725 -> a
+    168:170:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):727:729 -> a
+    171:186:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):728:743 -> a
+    187:190:com.android.tools.r8.graph.DexType computeOutlineClassType():943:946 -> a
+    187:190:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):743 -> a
     191:191:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    191:191:com.android.tools.r8.graph.DexType computeOutlineClassType():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
+    191:191:com.android.tools.r8.graph.DexType computeOutlineClassType():946 -> a
+    191:191:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):743 -> a
+    192:192:com.android.tools.r8.graph.DexType computeOutlineClassType():948:948 -> a
+    192:192:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):743 -> a
+    193:245:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):743:795 -> a
+    246:253:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):789:796 -> a
+    254:254:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):660:660 -> a
+    255:255:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):656:656 -> a
+    256:257:void lambda$optimize$8(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):740:741 -> a
+    258:261:void waveStart(java.util.Collection):800:803 -> a
+    262:262:void addWaveDoneAction(com.android.tools.r8.utils.Action):814:814 -> a
+    263:263:boolean isInWave():824:824 -> a
+    263:263:void addWaveDoneAction(com.android.tools.r8.utils.Action):817 -> a
+    264:264:void addWaveDoneAction(com.android.tools.r8.utils.Action):820:820 -> a
+    265:265:void addWaveDoneAction(com.android.tools.r8.utils.Action):818:818 -> a
+    266:266:void addWaveDoneAction(com.android.tools.r8.utils.Action):815:815 -> a
+    267:267:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):828:828 -> a
+    268:273:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):838:843 -> a
+    274:291:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):842:859 -> a
+    292:302:java.lang.Object lambda$forEachSelectedOutliningMethod$13(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):845:855 -> a
+    303:306:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):864:867 -> a
+    307:318:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):866:877 -> a
+    319:319:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):911:911 -> a
+    320:329:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):924:933 -> a
+    330:330:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1012:1012 -> a
+    330:330:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):933 -> a
+    331:331:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):933:933 -> a
+    332:332:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):932:932 -> a
+    333:336:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):955:958 -> a
+    337:342:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):964:969 -> a
+    343:348:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):973:978 -> a
     349:349:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    349:349:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):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
+    349:349:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):979 -> a
+    350:350:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):979:979 -> a
+    351:351:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):975:975 -> a
+    352:354:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):996:998 -> a
+    355:355:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):997:997 -> a
+    356:356:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1000:1000 -> a
     357:357:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    357:357:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):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
+    357:357:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1004 -> a
+    358:358:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1004:1004 -> a
+    359:359:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1000:1000 -> a
+    360:366:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1021:1027 -> a
+    367:369:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1069:1071 -> a
+    370:375:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1070:1075 -> a
+    376:376:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1012:1012 -> a
+    376:376:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1075 -> a
+    377:377:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1075:1075 -> a
+    378:391:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1074:1087 -> a
+    392:397:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1731:1736 -> a
+    392:397:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1090 -> a
+    398:404:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1091:1097 -> a
+    405:405:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1281:1281 -> a
+    405:405:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1097 -> a
+    406:420:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1098:1112 -> a
+    421:421:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():979:979 -> a
+    421:421:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1112 -> a
+    422:436:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1113:1127 -> a
+    437:437:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484:1484 -> a
+    437:437:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    438:438:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    438:438:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484 -> a
+    438:438:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    439:441:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484:1486 -> a
+    439:441:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    442:442:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    442:442:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1486 -> a
+    442:442:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    443:446:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1487:1490 -> a
+    443:446:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    447:461:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1136:1150 -> a
     462:462:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):90:90 -> a
-    462:462:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):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
+    462:462:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1151 -> a
+    463:566:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1152:1255 -> a
+    567:569:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):1032:1034 -> a
+    567:569:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1256 -> a
+    570:578:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1259:1267 -> a
+    579:597:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1266:1284 -> a
+    598:598:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():979:979 -> a
+    598:598:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1284 -> a
+    599:622:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1285:1308 -> a
+    623:693:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1300:1370 -> a
+    694:694:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    694:694:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1370 -> a
+    695:705:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1371:1381 -> a
+    706:711:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):891:896 -> a
+    706:711:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1381 -> a
+    712:755:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1382:1425 -> a
+    756:760:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):189:193 -> a
+    756:760:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1425 -> a
+    761:767:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.collectParameterUsages(int,com.android.tools.r8.ir.code.Value):205:211 -> a
+    761:767:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):196 -> a
+    761:767:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1425 -> a
+    768:771:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):198:201 -> a
+    768:771:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1425 -> a
+    772:788:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1426:1442 -> a
+    789:789:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):189:189 -> a
+    789:789:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1425 -> a
+    790:792:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1447:1449 -> a
+    793:793:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1289:1289 -> a
+    793:793:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1449 -> a
+    794:810:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1450:1466 -> a
+    811:816:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1465:1470 -> a
+    817:817:void lambda$rewriteCodeInternal$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1184:1184 -> a
+    818:818:com.android.tools.r8.ir.optimize.InliningOracle lambda$rewriteCodeInternal$17(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):1310:1310 -> a
+    819:820:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1474:1475 -> a
+    821:821:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    821:821:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1475 -> a
+    822:826:void finalizeToCf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1494:1498 -> a
+    822:826:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1476 -> a
+    827:827:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1478:1478 -> a
+    828:831:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1503:1506 -> a
+    828:831:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    832:836:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1530:1534 -> a
+    832:836:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1507 -> a
+    832:836:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    837:839:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1508:1510 -> a
+    837:839:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    840:840:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1012:1012 -> a
+    840:840:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1510 -> a
+    840:840:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    841:841:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1510:1510 -> a
+    841:841:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    842:846:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1509:1513 -> a
+    842:846:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    847:847:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1616:1616 -> a
+    848:848:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1265:1265 -> a
+    848:848:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1616 -> a
+    849:860:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1619:1630 -> a
+    861:863:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1676:1678 -> a
+    861:863:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1631 -> a
+    864:864:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1634:1634 -> a
+    865:866:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1683:1684 -> a
+    865:866:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1635 -> a
+    867:868:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1688:1689 -> a
+    867:868:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1638 -> a
+    869:870:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1641:1642 -> a
+    871:875:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1662:1666 -> a
+    871:875:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1643 -> a
+    876:881:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1644:1649 -> a
+    882:893:void ensureThrowingInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):1698:1709 -> a
+    882:893:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
+    894:895:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$19(com.android.tools.r8.graph.DexItemFactory):1624:1625 -> a
+    896:896:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$19(com.android.tools.r8.graph.DexItemFactory):1623:1623 -> a
+    897:897:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1671:1671 -> a
+    898:898:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1747:1747 -> a
+    899:899:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
+    899:899:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1748 -> a
+    900:917:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1749:1766 -> a
+    1:6:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):480:485 -> b
+    7:18:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):483:494 -> b
+    19:28:void convertMethods(com.android.tools.r8.graph.DexProgramClass):545:554 -> b
+    29:57:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):564:592 -> b
     58:58:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
-    58:58:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):597 -> b
-    59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> b
+    58:58:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):592 -> b
+    59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> b
+    59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> b
     59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> b
-    59:59:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):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
+    59:59:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):592 -> b
+    60:64:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):592:596 -> b
+    65:65:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> b
+    65:65:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596 -> b
+    66:72:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596:602 -> b
+    73:73:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):599:599 -> b
     74:74:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> b
-    74:74:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):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):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
+    74:74:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):599 -> b
+    75:80:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):599:604 -> b
+    81:81:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> b
+    81:81:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):604 -> b
+    82:86:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1530:1534 -> b
+    82:86:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):605 -> b
+    87:89:void lambda$optimize$9(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):749:751 -> b
+    90:90:boolean isInWave():824:824 -> b
+    91:93:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):987:989 -> b
+    94:102:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1045:1053 -> b
+    103:103:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1051:1051 -> b
+    104:109:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1519:1524 -> b
+    110:114:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1522:1526 -> b
+    115:115:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1565:1565 -> b
+    116:116:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1302:1302 -> b
+    116:116:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1565 -> b
+    117:133:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1569:1585 -> b
+    134:137:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1715:1718 -> b
+    134:137:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
+    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> b
+    138:138:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1718 -> b
+    138:138:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
+    139:147:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1719:1727 -> b
+    139:147:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
+    148:152:boolean lambda$workaroundForwardingInitializerBug$18(com.android.tools.r8.ir.code.Instruction):1587:1591 -> b
+    153:154:void printPhase(java.lang.String):1741:1742 -> b
+    1:20:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):507:526 -> c
+    21:27:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):525:531 -> c
     28:41:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithAddedOrReplaced(com.android.tools.r8.graph.DexAnnotation):125:138 -> c
-    28:41:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):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):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
+    28:41:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):531 -> c
+    42:42:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):531:531 -> c
+    43:47:com.android.tools.r8.graph.DexApplication optimize():612:616 -> c
+    48:49:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):829:830 -> c
+    50:50:void lambda$computeReachabilitySensitivity$11(com.android.tools.r8.graph.DexEncodedMethod):830:830 -> c
+    51:56:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1542:1547 -> c
+    57:57:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1314:1314 -> c
+    57:57:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1547 -> c
+    58:58:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548:1548 -> c
+    59:71:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3680:3692 -> c
+    59:71:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> c
+    72:72:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> c
+    72:72:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3693 -> c
+    72:72:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> c
+    73:74:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3693:3694 -> c
+    73:74:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> c
+    75:75:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3680:3680 -> c
+    75:75:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> c
+    76:85:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1550:1559 -> c
+    86:86:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1558:1558 -> c
     boolean lambda$convertMethod$5(com.android.tools.r8.graph.DexEncodedMethod) -> d
-    1:1:void lambda$convertClasses$3(com.android.tools.r8.graph.DexProgramClass):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
+    1:1:void lambda$convertClasses$3(com.android.tools.r8.graph.DexProgramClass):539:539 -> d
+    2:2:void clearDexMethodCompilationState():907:907 -> d
+    1:7:boolean enableTryWithResourcesDesugaring():366:372 -> e
+    8:8:com.android.tools.r8.graph.DexType lambda$updateMainDexListWithSynthesizedClassMap$1(com.android.tools.r8.graph.DexProgramClass):484:484 -> e
+    9:13:java.lang.Object lambda$forEachSynthesizedServiceLoaderMethod$14(com.android.tools.r8.graph.DexEncodedMethod):869:873 -> e
+    1:1:boolean enableTwrCloseResourceDesugaring():362:362 -> f
+    2:2:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$2(com.android.tools.r8.graph.DexProgramClass):523:523 -> f
+    3:3:void lambda$waveStart$10(com.android.tools.r8.graph.DexEncodedMethod):803:803 -> f
+    1:2:boolean removeLambdaDeserializationMethods():376:377 -> g
+    1:3:void waveDone():808:810 -> h
 com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.w.c.P:
     java.util.Map protoFixupCache -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -27773,7 +27800,7 @@
     19:39:boolean unlinkDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):484:504 -> a
     19:39:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):111 -> a
     40:58:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):114:132 -> a
-    59:59:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():977:977 -> a
+    59:59:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():979:979 -> a
     59:59:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):132 -> a
     60:63:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):133:136 -> a
     64:104:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):135:175 -> a
@@ -28020,7 +28047,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():1425:1427 -> b
+    28:30:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.startOfGotoChain():1461:1463 -> b
     28:30:com.android.tools.r8.ir.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
@@ -28046,10 +28073,10 @@
     1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.IdentifierNameStringMarker):43:47 -> <init>
     1:21:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):51:71 -> a
     22:45:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):80:103 -> a
-    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     46:46:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):104 -> a
     47:52:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):104:109 -> a
-    53:53:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    53:53:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     53:53:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):110 -> a
     54:75:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):111:132 -> a
     76:88:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):129:141 -> a
@@ -28182,7 +28209,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():879:879 -> a
+    9:9:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     9:9:void desugar(com.android.tools.r8.ir.code.IRCode):93 -> a
     10: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
@@ -28223,7 +28250,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():309:309 -> a
+    12:12:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     12:12:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1308 -> a
     13:24:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1309:1320 -> a
     25:25:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1326:1326 -> a
@@ -28341,7 +28368,12 @@
     171:171:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
     171:171:com.android.tools.r8.graph.DexEncodedMethod addForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):114 -> a
     172:186:com.android.tools.r8.graph.DexEncodedMethod addForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):117:131 -> a
-    187:206:void hideCandidates(java.util.List,java.util.List,java.util.List):260:279 -> a
+    187:191:void hideCandidates(java.util.List,java.util.List,java.util.List):260:264 -> a
+    192:192:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    192:192:void hideCandidates(java.util.List,java.util.List,java.util.List):264 -> a
+    193:206:void hideCandidates(java.util.List,java.util.List,java.util.List):266:279 -> a
+    207:207:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    207:207:void hideCandidates(java.util.List,java.util.List,java.util.List):264 -> a
 com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.w.d.d:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.ir.conversion.IRConverter converter -> a
@@ -28445,9 +28477,20 @@
     java.util.Set hidden -> b
     1:5:void <init>():19:23 -> <init>
     1:2:void merge(com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection):62:63 -> a
-    3:8:void hideMatches(com.android.tools.r8.graph.DexMethod):67:72 -> a
-    9:9:void addDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):78:78 -> a
-    10:43:java.util.List createCandidatesList():83:116 -> a
+    3:5:void hideMatches(com.android.tools.r8.graph.DexMethod):67:69 -> a
+    6:6:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    6:6:void hideMatches(com.android.tools.r8.graph.DexMethod):70 -> a
+    7:8:void hideMatches(com.android.tools.r8.graph.DexMethod):71:72 -> a
+    9:9:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    9:9:void hideMatches(com.android.tools.r8.graph.DexMethod):70 -> a
+    10:10:void addDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):78:78 -> a
+    11:38:java.util.List createCandidatesList():83:110 -> a
+    39:39:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    39:39:java.util.List createCandidatesList():110 -> a
+    40:40:java.util.List createCandidatesList():112:112 -> a
+    41:41:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    41:41:java.util.List createCandidatesList():110 -> a
+    42:42:java.util.List createCandidatesList():116:116 -> a
     1:8:java.util.List createFullList():123:130 -> b
     1:3:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection wrapInCollection():136:138 -> c
 com.android.tools.r8.ir.desugar.DefaultMethodsHelper$1 -> com.android.tools.r8.w.d.f:
@@ -28467,88 +28510,83 @@
     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
+    1:1:void <clinit>():59:59 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):68:68 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView):66:71 -> <init>
+    1:1:void desugar(com.android.tools.r8.ir.code.IRCode):76:76 -> a
+    2:9:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):119:126 -> a
+    2:9:void desugar(com.android.tools.r8.ir.code.IRCode):80 -> a
     10:10:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    10:10:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):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
+    10:10:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):126 -> a
+    10:10:void desugar(com.android.tools.r8.ir.code.IRCode):80 -> a
+    11:15:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):130:134 -> a
+    11:15:void desugar(com.android.tools.r8.ir.code.IRCode):80 -> a
+    16:34:void generateCallBack(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):173:191 -> a
+    16:34:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):134 -> a
+    16:34:void desugar(com.android.tools.r8.ir.code.IRCode):80 -> a
+    35:36:void addCallBackSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):196:197 -> a
+    35:36:void generateCallBack(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):192 -> a
+    35:36:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):134 -> a
+    35:36:void desugar(com.android.tools.r8.ir.code.IRCode):80 -> a
+    37:53:void desugar(com.android.tools.r8.ir.code.IRCode):82:98 -> a
+    54:54:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    54:54:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    55:60:void desugar(com.android.tools.r8.ir.code.IRCode):99:104 -> a
+    61:72:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):262:273 -> a
+    61:72:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    73:74:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):390:391 -> a
+    73:74:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):276 -> a
+    73:74:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    75:75:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414:414 -> a
+    75:75:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):391 -> a
+    75:75:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):276 -> a
+    75:75:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    76:76:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    76:76:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414 -> a
+    76:76:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):391 -> a
+    76:76:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):276 -> a
+    76:76:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    77:79:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):392:394 -> a
+    77:79:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):276 -> a
+    77:79:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    80:103:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):279:302 -> a
+    80:103:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    104:107:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):381:384 -> a
+    104:107:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):304 -> a
+    104:107:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    108:108:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414:414 -> a
+    108:108:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):384 -> a
+    108:108:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):304 -> a
+    108:108:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    109:109:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    109:109:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414 -> a
+    109:109:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):384 -> a
+    109:109:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):304 -> a
+    109:109:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    110:110:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):385:385 -> a
+    110:110:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):304 -> a
+    110:110:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    111:132:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):303:324 -> a
+    111:132:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    133:133:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):66:66 -> a
+    133:133:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):320 -> a
+    133:133:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    134:135:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):326:327 -> a
+    134:135:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    136:156:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):326:346 -> a
+    136:156:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    157:166:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):140:149 -> a
+    167:167:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    167:167:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):149 -> a
+    168:178:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):153:163 -> a
+    179:193:com.android.tools.r8.graph.DexMethod methodWithVivifiedTypeInSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):202:216 -> a
+    194:198:void generateWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):222:226 -> a
+    199:203:void warnInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.lang.String):231:235 -> a
+    204:206:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):251:253 -> a
+    207:224:void splitIfCatchHandlers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):355:372 -> a
+    225:235:com.android.tools.r8.graph.DexMethod createConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):400:410 -> a
+    236:236:com.android.tools.r8.graph.DexMethod createConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):409:409 -> a
+    237:238:boolean canConvert(com.android.tools.r8.graph.DexType):418:419 -> a
 com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration -> com.android.tools.r8.w.d.i:
     java.util.Map rewritePrefix -> c
     java.util.Map emulateLibraryInterface -> d
@@ -28672,104 +28710,121 @@
     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
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter):116:116 -> <init>
+    2:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter):103:119 -> <init>
+    1:1:boolean canGenerateWrapper(com.android.tools.r8.graph.DexType):135:135 -> 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
+    2:2:boolean canGenerateWrapper(com.android.tools.r8.graph.DexType):135 -> a
+    3:3:boolean canGenerateWrapper(com.android.tools.r8.graph.DexType):139:139 -> a
+    4:17:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):170:183 -> a
+    18:18:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    18:18:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):183 -> a
+    19:30:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):185:196 -> a
+    31:32:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):187:188 -> a
+    33:35:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
+    33:35:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):190 -> a
+    36:36:com.android.tools.r8.graph.DexType getWrapper(com.android.tools.r8.graph.DexType,java.lang.String,java.util.Map,java.util.function.BiFunction):198:198 -> a
+    37:37: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):176:176 -> a
+    38:40:com.android.tools.r8.graph.DexType createWrapperType(com.android.tools.r8.graph.DexType,java.lang.String):155:157 -> a
+    38:40:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):177 -> a
+    41:41:com.android.tools.r8.graph.DexType createWrapperType(com.android.tools.r8.graph.DexType,java.lang.String):156:156 -> a
+    41:41:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):177 -> a
+    42:42:com.android.tools.r8.graph.DexType createWrapperType(com.android.tools.r8.graph.DexType,java.lang.String):155:155 -> a
+    42: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):177 -> 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):178:179 -> a
+    45:45:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):206:206 -> a
+    46:50:com.android.tools.r8.graph.DexEncodedField synthesizeWrappedValueField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):434:438 -> a
+    46:50:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):207 -> a
+    51:51:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):202:202 -> a
+    51:51:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):209 -> a
+    52:52:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):211:211 -> a
+    53:67:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):306:320 -> a
+    53:67:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):211 -> a
+    68:68:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    68:68:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):320 -> a
+    68:68:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):211 -> a
+    69:71:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):321:323 -> a
+    69:71:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):211 -> a
+    72:72:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():252:252 -> a
+    72:72:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):326 -> a
+    72:72:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):211 -> a
+    73:88:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):327:342 -> a
+    73:88:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):211 -> a
+    89:94:com.android.tools.r8.graph.DexEncodedMethod[] finalizeWrapperMethods(java.util.List,java.util.Set):349:354 -> a
+    89:94:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):344 -> a
+    89:94:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):211 -> a
+    95:95:com.android.tools.r8.graph.DexProgramClass generateTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):208:208 -> a
+    96:113: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):232:249 -> a
+    114:117:com.android.tools.r8.graph.DexEncodedMethod synthesizeConstructor(com.android.tools.r8.graph.DexField):442:445 -> a
+    114: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):253 -> a
+    118:126:com.android.tools.r8.graph.DexEncodedMethod synthesizeConstructor(com.android.tools.r8.graph.DexField):443:451 -> a
+    118:126: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):253 -> a
+    127:132:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):456:461 -> a
+    127:132:com.android.tools.r8.graph.DexEncodedMethod synthesizeConstructor(com.android.tools.r8.graph.DexField):447 -> a
+    127:132: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):253 -> a
+    133:137: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):253:257 -> a
+    138:138:java.lang.String lambda$reportFinalMethodsInWrapper$1(com.android.tools.r8.graph.DexMethod):359:359 -> a
+    139:139:java.lang.String[] lambda$reportFinalMethodsInWrapper$2(int):359:359 -> a
+    140:149:void reportFinalMethodsInWrapper(java.util.Set):359:368 -> a
+    150:150:void reportFinalMethodsInWrapper(java.util.Set):363:363 -> a
+    151:159: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):374:382 -> a
+    160:182:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexLibraryClass):387:409 -> a
+    183:183:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    183:183:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexLibraryClass):409 -> a
+    184:188:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexLibraryClass):410:414 -> a
+    189:189:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    189:189:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexLibraryClass):414 -> a
+    190:199:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexLibraryClass):415:424 -> a
+    200:202:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):473:475 -> a
+    203:203: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):490:490 -> a
+    204:208:boolean verifyAllClassesGenerated():501:505 -> a
+    204: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):490 -> a
+    209:212: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):491:494 -> a
+    213:214:void registerSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexApplication$Builder):512:513 -> a
+    213:214: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):495 -> a
+    215: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):496:496 -> a
+    216:218:void generateTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):517:519 -> a
+    219:219:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):202:202 -> a
+    219:219:void generateTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):524 -> a
+    220:220:void generateTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):525:525 -> a
+    221:221:void generateTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):520:520 -> a
+    222:222:void generateTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):519:519 -> a
+    223:225: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):545:547 -> a
+    226:250: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):546:570 -> a
+    251:256:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,int,boolean,com.android.tools.r8.graph.Code):456:461 -> a
+    251:256: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):572 -> a
+    1:1:com.android.tools.r8.graph.DexType getTypeWrapper(com.android.tools.r8.graph.DexType):143:143 -> b
+    2:2:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):217:217 -> b
+    3:3:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):202:202 -> b
+    3:3:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):219 -> b
+    4:8:com.android.tools.r8.graph.DexEncodedField synthesizeWrappedValueField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):434:438 -> b
+    4:8:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):219 -> b
+    9:9:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):223:223 -> b
+    10:23:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):262:275 -> b
+    10:23:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):223 -> b
+    24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> b
+    24:24:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):275 -> b
+    24:24:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):223 -> b
+    25:27:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):276:278 -> b
+    25:27:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):223 -> b
+    28:28:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():252:252 -> b
+    28:28:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):283 -> b
+    28:28:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):223 -> b
+    29:44:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):284:299 -> b
+    29:44:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):223 -> b
+    45:50:com.android.tools.r8.graph.DexEncodedMethod[] finalizeWrapperMethods(java.util.List,java.util.Set):349:354 -> b
+    45:50:com.android.tools.r8.graph.DexEncodedMethod[] synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedField):301 -> b
+    45:50:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):223 -> b
+    51:51:com.android.tools.r8.graph.DexProgramClass generateVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):220:220 -> b
+    52:53:void generateVivifiedTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):529:530 -> b
+    54:54:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType):202:202 -> b
+    54:54:void generateVivifiedTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):534 -> b
+    55:55:void generateVivifiedTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):536:536 -> b
+    56:56:void generateVivifiedTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):531:531 -> b
+    57:57:void generateVivifiedTypeConversions(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):530:530 -> b
+    1:1:com.android.tools.r8.graph.DexType getVivifiedTypeWrapper(com.android.tools.r8.graph.DexType):147:147 -> c
+    1:1:boolean hasSynthesized(com.android.tools.r8.graph.DexType):127:127 -> d
+    1:1:boolean isSynthesizedWrapper(com.android.tools.r8.graph.DexType):123:123 -> e
 com.android.tools.r8.ir.desugar.InterfaceMethodRewriter -> com.android.tools.r8.w.d.l:
     java.util.concurrent.ConcurrentHashMap nearestEmulatedInterfaceCache -> g
     java.util.Set synthesizedMethods -> h
@@ -28853,7 +28908,7 @@
     260:260:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
     260:260:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):352 -> a
     261:261:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):362:362 -> a
-    262:262:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    262:262:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     262:262:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):362 -> a
     263:275:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):362:374 -> a
     276:276:java.util.Set lambda$rewriteMethodReferences$0(com.android.tools.r8.graph.DexLibraryClass):236:236 -> a
@@ -28918,7 +28973,7 @@
     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:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     405:405:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):964 -> a
     406:409:java.util.Map processEmulatedInterfaceHierarchy():575:578 -> a
     406:409:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):556 -> a
@@ -28930,121 +28985,121 @@
     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:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):636:641 -> a
     418:423:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     418:423:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    424:430:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):640:646 -> a
+    424:430:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):640:646 -> a
     424:430:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     424:430:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     431:431:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
-    431:431:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648 -> a
+    431:431:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648 -> a
     431:431:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     431:431:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    432:432:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648:648 -> a
+    432:432:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648:648 -> a
     432:432:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     432:432:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    433:451:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):647:665 -> a
+    433:451:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):647:665 -> a
     433:451:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     433:451:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     452:452:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    452:452:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):665 -> a
+    452:452:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):665 -> a
     452:452:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     452:452:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    453:453:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666:666 -> a
+    453:453:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666:666 -> a
     453:453:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     453:453:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     454:460:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):612:618 -> a
-    454:460:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666 -> a
+    454:460:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666 -> a
     454:460:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     454:460:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     461:461:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
     461:461:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):618 -> a
-    461:461:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666 -> a
+    461:461:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666 -> a
     461:461:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     461:461:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     462:462:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):620:620 -> a
-    462:462:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666 -> a
+    462:462:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666 -> a
     462:462:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     462:462:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    463:467:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:671 -> a
+    463:467:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:671 -> a
     463:467:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     463:467:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    468:470:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):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:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1264:1266 -> a
+    468:470:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672 -> a
     468:470:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     468:470:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    471:471:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672:672 -> a
+    471:471:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672:672 -> a
     471:471:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     471:471:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    472:472:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):670:670 -> a
+    472:472:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):670:670 -> a
     472:472:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     472:472:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    473:473:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:667 -> a
+    473:473:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:667 -> a
     473:473:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     473:473:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    474: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:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1264:1264 -> a
+    474:474:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672 -> a
     474:474:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     474:474:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    475:476:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):680:681 -> a
+    475:476:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):680:681 -> a
     475:476:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     475:476:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     477:477:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    477:477:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):681 -> a
+    477:477:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):681 -> a
     477:477:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     477:477:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    478:480:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):682:684 -> a
+    478:480:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):682:684 -> a
     478:480:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     478:480:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     481:481:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():248:248 -> a
-    481:481:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):685 -> a
+    481:481:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):685 -> a
     481:481:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     481:481:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    482:482:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):686:686 -> a
+    482:482:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):686:686 -> a
     482:482:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     482:482:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     483:483:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
-    483:483:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690 -> a
+    483:483:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690 -> a
     483:483:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     483:483:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    484:484:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690:690 -> a
+    484:484:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690:690 -> a
     484:484:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     484:484:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    485: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:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1264:1266 -> a
+    485:487:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691 -> a
     485:487:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     485:487:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    488:488:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691:691 -> a
+    488:488:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691:691 -> a
     488:488:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     488:488:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    489:489:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):689:689 -> a
+    489:489:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):689:689 -> a
     489:489:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     489:489:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    490:490:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):686:686 -> a
+    490:490:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):686:686 -> a
     490:490:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     490:490:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    491:491:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):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:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1264:1264 -> a
+    491:491:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691 -> a
     491:491:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     491:491:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    492:492:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:697 -> a
+    492:492:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:697 -> a
     492:492:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     492:492:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     493: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:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699 -> a
     493:495:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     493:495:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     496:496:com.android.tools.r8.graph.DexMethod emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):628:628 -> a
-    496:496:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699 -> a
+    496:496:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):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:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699:699 -> a
     497:497:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     497:497:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    498:498:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):698:698 -> a
+    498:498:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):698:698 -> a
     498:498:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     498:498:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    499:540:com.android.tools.r8.graph.DexProgramClass synthetizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:738 -> a
+    499:540:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:738 -> a
     499:540:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     499:540:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
     541:541:boolean isInMainDexList(com.android.tools.r8.graph.DexType):815:815 -> a
@@ -29076,7 +29131,7 @@
     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:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     603:603:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):986 -> a
     604:605:void renameEmulatedInterfaces():881:882 -> a
     604:605:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
@@ -29154,7 +29209,7 @@
     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 com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> b
     3:3:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528 -> b
     4:8:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528:532 -> b
     9:10:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):748:749 -> b
@@ -29359,14 +29414,20 @@
 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
+    1:6:boolean ensureAccessibility():632:637 -> a
+    7:7:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    7:7:boolean ensureAccessibility():638 -> a
+    8:22:boolean ensureAccessibility():641:655 -> a
 com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.w.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
+    1:6:boolean ensureAccessibility():584:589 -> a
+    7:7:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    7:7:boolean ensureAccessibility():590 -> a
+    8:25:boolean ensureAccessibility():593:610 -> a
+    26:33:boolean ensureAccessibility():609:616 -> a
 com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.w.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
@@ -29466,7 +29527,7 @@
     14:46:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):82:114 -> a
     47:47:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57:57 -> a
     47:47:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):121 -> a
-    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):434:434 -> a
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):435:435 -> a
     48:48:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57 -> a
     48:48:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):121 -> a
     49:58:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):122:131 -> a
@@ -29476,12 +29537,12 @@
     62:62:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):229:229 -> a
     63:63:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():513:513 -> a
     63:63:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
-    64:64:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    64:64:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     64:64:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():513 -> a
     64:64:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
     65:65:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():522:522 -> a
     65:65:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
-    66:66:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    66:66:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     66:66:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():522 -> a
     66:66:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
     67:77:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():522:532 -> a
@@ -29493,7 +29554,7 @@
     95:112:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):289:306 -> a
     113:113:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57:57 -> a
     113:113:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
-    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):434:434 -> a
+    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):435:435 -> a
     114:114:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57 -> a
     114:114:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
     115:156:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):310:351 -> a
@@ -29559,77 +29620,88 @@
     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
+    20:38:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):144:162 -> a
+    39:40:com.android.tools.r8.ir.desugar.LambdaClass getKnownLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):333:334 -> a
+    39:40:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):163 -> a
+    41:42:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):164:165 -> a
+    43:54:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):377:388 -> a
+    43:54:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    55:55:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):387 -> a
+    55:55:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    56:89:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):390:423 -> a
+    56:89:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    90:90:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):40:40 -> a
+    90:90:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):423 -> a
+    90:90:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    91:116:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):425:450 -> a
+    91:116:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    117:118:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getCreateInstanceMethod():141:142 -> a
+    117:118:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):452 -> a
+    117:118:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    119:120:void patchInstruction(com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):452:453 -> a
+    119:120:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
+    121:122:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):174:175 -> a
+    123:123:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    123:123:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):175 -> a
+    124:126:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):175:177 -> a
+    127:134:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):185:192 -> a
+    135:145:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):465:475 -> a
+    135:145:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    146:146:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    146:146:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):474 -> a
+    146:146:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    147:164:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):480:497 -> a
+    147:164:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    165:166:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getCreateInstanceMethod():141:142 -> a
+    165:166:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):499 -> a
+    165:166:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    167:168:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):499:500 -> a
+    167:168:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    169:171:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):200:202 -> a
+    172:172:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):201:201 -> a
+    173:181:boolean removeLambdaDeserializationMethods(java.lang.Iterable):210:218 -> a
+    182:182:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):194:194 -> a
+    182:182:boolean removeLambdaDeserializationMethods(java.lang.Iterable):218 -> a
+    183:185:boolean removeLambdaDeserializationMethods(java.lang.Iterable):219:221 -> a
+    186:192:void adjustAccessibility():237:243 -> a
+    193:193:void adjustAccessibility():242:242 -> a
+    194:195:com.android.tools.r8.graph.DexProgramClass getLambdaClass(com.android.tools.r8.graph.DexType):252:253 -> a
+    196:205:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):259:268 -> a
+    206:206:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):265:265 -> a
+    207:211:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):287:291 -> a
+    212:218:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):358:364 -> a
+    212:218:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):290 -> a
+    219:219:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):290:290 -> a
+    220:220:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):365:365 -> a
+    220:220:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):290 -> a
+    221:225:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):301:305 -> a
+    226:232:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):358:364 -> a
+    226:232:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306 -> a
+    233:237:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306:310 -> a
+    238:238:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
+    238:238:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):310 -> a
+    239:246:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):311:318 -> a
+    247:257:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):338:348 -> a
+    247:257:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    258:258:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):347:347 -> a
+    258:258:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    259:259:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):346:346 -> a
+    259:259:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    260:260:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):344:344 -> a
+    260:260:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    261:261:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):365:365 -> a
+    261:261:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306 -> a
+    262:262:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):325:325 -> a
+    263:263:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    263:263:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):325 -> a
+    264:264:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):325:325 -> a
+    265:265:boolean isInMainDexList(com.android.tools.r8.graph.DexType):295:295 -> a
+    265:265:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):326 -> a
+    266:266:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):327:327 -> a
+    267:269:java.lang.Object getKnown(java.util.Map,java.lang.Object):352:354 -> a
     1:1:boolean hasLambdaClassPrefix(com.android.tools.r8.graph.DexType):91:91 -> b
-    2:4:java.util.Set getDesugaredCallSites():269:271 -> b
+    2:4:java.util.Set getDesugaredCallSites():273:275 -> 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
@@ -29661,18 +29733,18 @@
     3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
     3:3:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):79 -> a
     4:4:java.util.concurrent.Future asyncProcessNest(com.android.tools.r8.graph.DexClass,java.util.concurrent.ExecutorService):112:112 -> a
-    5:7:void synthetizeNestConstructor(com.android.tools.r8.graph.DexApplication$Builder):171:173 -> a
+    5:7:void synthesizeNestConstructor(com.android.tools.r8.graph.DexApplication$Builder):171:173 -> a
     8:15:boolean invokeRequiresRewriting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):244:251 -> a
     16:23:boolean fieldAccessRequiresRewriting(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):255:262 -> a
     24:25:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):282:283 -> a
     26:27:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):225:226 -> a
     26:27:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):284 -> a
-    28:28:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():115:115 -> a
+    28:28:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():114:114 -> a
     28:28:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):228 -> a
     28:28:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):284 -> a
     29:32:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):228:231 -> a
     29:32:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):284 -> a
-    33:33:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():115:115 -> a
+    33:33:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():114:114 -> a
     33:33:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):233 -> a
     33:33:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):284 -> a
     34:39:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):234:239 -> a
@@ -29680,14 +29752,14 @@
     40:40:com.android.tools.r8.graph.DexString computeFieldBridgeName(com.android.tools.r8.graph.DexEncodedField,boolean):193:193 -> a
     40:40:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):240 -> a
     40:40:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):284 -> a
-    41:41:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():115:115 -> a
+    41:41:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():114:114 -> a
     41:41:com.android.tools.r8.graph.DexString computeFieldBridgeName(com.android.tools.r8.graph.DexEncodedField,boolean):195 -> a
     41:41:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):240 -> a
     41:41:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):284 -> a
     42:44:com.android.tools.r8.graph.DexString computeFieldBridgeName(com.android.tools.r8.graph.DexEncodedField,boolean):196:198 -> a
     42:44:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):240 -> a
     42:44:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):284 -> a
-    45:45:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():115:115 -> a
+    45:45:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():114:114 -> a
     45:45:com.android.tools.r8.graph.DexString computeFieldBridgeName(com.android.tools.r8.graph.DexEncodedField,boolean):199 -> a
     45:45:com.android.tools.r8.graph.DexMethod computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):240 -> a
     45:45:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):284 -> a
@@ -29701,15 +29773,15 @@
     60:65:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):301:306 -> a
     66:67:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):219:220 -> a
     66:67:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    68:70:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1275:1277 -> a
+    68:70:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1278:1280 -> a
     68:70:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     68:70:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    71:74:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1276:1279 -> a
+    71:74:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1279:1282 -> a
     71:74:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     71:74:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     75:75:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):221:221 -> a
     75:75:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    76:76:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1275:1275 -> a
+    76:76:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1278:1278 -> a
     76:76:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     76:76:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     77:84:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):308:315 -> a
@@ -29862,8 +29934,8 @@
     2:4:void <init>(com.android.tools.r8.graph.AppView):34:36 -> <init>
     boolean shouldProcessClassInNest(com.android.tools.r8.graph.DexClass,java.util.List) -> a
     1:1:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:44 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1048 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1050 -> a
     2:2:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44 -> a
     3:4:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:45 -> a
     5:5:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:44 -> a
@@ -29974,7 +30046,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):959:959 -> a
+    12:12:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     12:12:void desugar():343 -> a
     13:13:void desugar():344:344 -> a
     14:15:void appendInstruction(com.android.tools.r8.ir.code.Instruction):308:309 -> a
@@ -29990,7 +30062,7 @@
     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):959:959 -> a
+    36:36:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     36:36:void desugar():365 -> a
     37:38:void desugar():369:370 -> a
     39:69:void desugar():369:399 -> a
@@ -30009,7 +30081,7 @@
     java.lang.String str -> c
     1:3:void <init>(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder,java.lang.String,com.android.tools.r8.graph.DexMethod):436:438 -> <init>
     1:2:com.android.tools.r8.ir.code.Value getOrCreateValue():443:444 -> a
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     3:3:com.android.tools.r8.ir.code.Value getOrCreateValue():444 -> a
     4:8:com.android.tools.r8.ir.code.Value getOrCreateValue():445:449 -> a
     9:9:com.android.tools.r8.ir.code.Value getOrCreateValue():445:445 -> a
@@ -30119,7 +30191,7 @@
     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():879:879 -> a
+    706:706:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     706:706:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):78 -> a
     707:723:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):79:95 -> a
     724:728:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):94:98 -> a
@@ -30727,10 +30799,10 @@
     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:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMethodWithDynamicDispatch():1124:1124 -> a
     21:21:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):96 -> a
     22:31:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):97:106 -> a
-    32:32:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMethodWithDynamicDispatch():1120:1120 -> a
+    32:32:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMethodWithDynamicDispatch():1124:1124 -> a
     32:32:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):106 -> a
     33:33:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):108:108 -> a
     34:50:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):106:122 -> a
@@ -30740,7 +30812,7 @@
     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:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     108:108:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):193 -> a
     109:119:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):194:204 -> a
     120:120:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
@@ -30749,7 +30821,7 @@
     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:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     124:124:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):208 -> a
     125:146:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):210:231 -> a
     147:147:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
@@ -30806,13 +30878,13 @@
     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():879:879 -> a
+    156:156:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     156:156:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):175 -> a
     157:183:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):176:202 -> a
-    184:184:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    184:184:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     184:184:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203 -> a
     185:185:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203:203 -> a
-    186:186:void com.android.tools.r8.utils.IteratorUtils.removeIf(com.android.tools.r8.ir.code.InstructionListIterator,java.util.function.Predicate):49:49 -> a
+    186:186:void com.android.tools.r8.utils.IteratorUtils.removeIf(com.android.tools.r8.ir.code.InstructionListIterator,java.util.function.Predicate):84:84 -> a
     186:186:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203 -> a
     187:231:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):209:253 -> a
     232:232:com.android.tools.r8.graph.DexField lambda$optimize$0(com.android.tools.r8.graph.DexEncodedField):221:221 -> a
@@ -30831,7 +30903,7 @@
     581:582:boolean com.android.tools.r8.graph.DexClass.definesStaticField(com.android.tools.r8.graph.DexField):445:446 -> a
     581:582:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):365 -> a
     583:583:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):366:366 -> a
-    584:588:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():815:819 -> a
+    584:588:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():819:823 -> a
     584:588:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):371 -> a
     589:607:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):374:392 -> a
     608:615:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):487:494 -> a
@@ -30858,504 +30930,487 @@
     boolean $assertionsDisabled -> e
     com.android.tools.r8.utils.InternalOptions options -> d
     com.android.tools.r8.ir.conversion.IRConverter converter -> a
-    1:1:void <clinit>():147:147 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):166:170 -> <init>
-    boolean lambda$computeConstantArrayValues$11(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Instruction) -> a
-    1:1:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):244:244 -> a
-    2:25:void collapseTrivialGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.List):328:351 -> a
-    26:26:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):418:418 -> a
-    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():1271:1271 -> a
-    27:27:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):418 -> a
-    28:29:boolean com.android.tools.r8.ir.code.IRCode.hasCatchHandlers():580:581 -> a
-    28:29:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):418 -> a
-    30:41:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):425:436 -> a
+    1:1:void <clinit>():131:131 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):150:154 -> <init>
+    boolean lambda$computeConstantArrayValues$9(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Instruction) -> a
+    1:1:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):228:228 -> a
+    2:25:void collapseTrivialGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.List):312:335 -> a
+    26:26:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):402:402 -> a
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():1273:1273 -> a
+    27:27:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):402 -> a
+    28:29:boolean com.android.tools.r8.ir.code.IRCode.hasCatchHandlers():625:626 -> a
+    28:29:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):402 -> a
+    30:41:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):409:420 -> a
     42:42:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
-    42:42:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):436 -> a
-    43:50:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):437:444 -> a
-    51:87:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):596:632 -> a
-    88:88:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):460:460 -> a
-    88:88:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):633 -> a
-    89:103:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):634:648 -> a
-    104:104:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):460:460 -> a
-    104:104:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):649 -> a
-    105:114:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):650:659 -> a
-    115:128:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):709:722 -> a
-    129:129:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):719:719 -> a
-    130:141:void tryAddToBiggestSavings(java.util.Set,java.util.PriorityQueue,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,int):732:743 -> a
-    142:149:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):748:755 -> a
-    150:150:int codeUnitMargin():762:762 -> a
-    151:151:int lambda$rewriteSwitch$1(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):924:924 -> a
-    152:155:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1205:1208 -> a
-    156:162:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1207:1213 -> a
-    163:163:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1212:1212 -> a
-    164:178:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1229:1243 -> a
-    179:179:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    179:179:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1243 -> a
-    180:212:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1250:1282 -> a
-    213:257:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1257:1301 -> a
-    258:324:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeClassInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):1458:1524 -> a
-    325:325:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):1555:1555 -> a
-    326:330:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):1558:1562 -> a
-    331:346:boolean isKotlinNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):1617:1632 -> a
-    331:346:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):1564 -> a
-    347:366:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):1565:1584 -> a
-    367:372:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):1583:1588 -> a
-    373:380:boolean isInstantiationOfNullPointerException(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.graph.DexItemFactory):1651:1658 -> a
-    373:380:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):1588 -> a
-    381:401:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$checksNullBeforeSideEffect$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):1589:1609 -> a
-    402:404:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1640:1642 -> a
-    405:405:boolean triggersClassInitializationBeforeSideEffect(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1672:1672 -> a
-    406:422:com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect lambda$triggersClassInitializationBeforeSideEffect$4(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):1675:1691 -> a
-    423:482:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):1703:1762 -> a
-    483:523:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):1722:1762 -> a
-    524:537:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):1749:1762 -> a
-    538:538:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1770:1770 -> a
-    539:539:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1769:1769 -> a
-    540:546:com.android.tools.r8.graph.DexType getArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1780:1786 -> a
-    540:546:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1773 -> a
-    547:547:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1773:1773 -> a
-    548:552:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1772:1776 -> a
-    553:560: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:1937 -> a
-    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():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
-    585:585: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):1964:1964 -> a
-    586:596:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2106:2116 -> a
-    597:597:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    597:597:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2117 -> a
-    598:617:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2118:2137 -> a
-    618:633:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2136:2151 -> a
-    634:634:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    634:634:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2152 -> a
-    635:651:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):2153:2169 -> a
-    652:652:boolean lambda$removeInstanceOfInstructionIfTrivial$5(com.android.tools.r8.ir.code.Value):2148:2148 -> a
-    653:655:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):2176:2178 -> a
-    656:656:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    656:656:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):2178 -> a
-    657:658:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):2180:2181 -> a
-    659:669:void removeOrReplaceByDebugLocalWrite(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2186:2196 -> a
-    670:671:boolean lambda$shortenLiveRanges$7(com.android.tools.r8.ir.code.ConstInstruction):2367:2368 -> a
-    672:764:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):2431:2523 -> a
-    765:777:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):2528:2540 -> a
-    778:780:boolean lambda$insertConstantInBlock$10(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):2534:2536 -> a
-    781:781:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():1232:1232 -> a
-    781:781:boolean lambda$insertConstantInBlock$10(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):2537 -> a
-    782:782:boolean lambda$insertConstantInBlock$10(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):2537:2537 -> a
-    783:830:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):2575:2622 -> a
-    831:836:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2950:2955 -> a
-    837:837:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2971:2971 -> a
-    838:844:boolean hasCSECandidate(com.android.tools.r8.ir.code.IRCode,int):2959:2965 -> a
-    838:844:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2972 -> a
-    845:847:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2974:2976 -> a
-    848:848:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
-    848:848:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2976 -> a
-    849:862:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2977:2990 -> a
-    863:872:boolean shareCatchHandlers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2937:2946 -> a
-    863:872:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2991 -> a
-    873:888:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2992:3007 -> a
-    889:890:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):3138:3139 -> a
-    891:891:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):3304:3304 -> a
-    892:892:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1009:1009 -> a
-    892:892:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):3304 -> a
-    893:894:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):3304:3305 -> a
-    895:922: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):3315:3342 -> a
-    923:923:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1009:1009 -> a
-    923:923: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):3346 -> a
-    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):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: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):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):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
-    95:95:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1324:1324 -> c
-    96:96:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1320:1320 -> c
-    97:100:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2289:2292 -> c
-    101:109:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2307:2315 -> c
-    101:109:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2293 -> c
-    110:110:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> c
-    110:110:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2315 -> c
-    110:110:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2293 -> c
-    111:113:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2315:2317 -> c
-    111:113:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2293 -> c
-    114:121:boolean hasPath(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2338:2345 -> c
-    114:121:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2318 -> c
-    114:121:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2293 -> c
-    122:123:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):2323:2324 -> c
-    122:123:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):2293 -> c
-    124:124:java.util.List lambda$shortenLiveRangesInsideBlock$9(com.android.tools.r8.ir.code.BasicBlock):2517:2517 -> c
-    125:175:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3164:3214 -> c
-    176:176:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1009:1009 -> c
-    176:176:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3215 -> c
-    177:186:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3217:3226 -> c
-    187:187:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3225:3225 -> c
-    188:188:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1009:1009 -> c
-    188:188:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3232 -> c
-    189:189:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3235:3235 -> c
-    190:203:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3234:3247 -> c
-    204:204:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3246:3246 -> c
-    205:205:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1009:1009 -> c
-    205:205:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):3253 -> c
-    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():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):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
+    42:42:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):420 -> a
+    43:50:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):421:428 -> a
+    51:87:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):580:616 -> a
+    88:88:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):444:444 -> a
+    88:88:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):617 -> a
+    89:103:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):618:632 -> a
+    104:104:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):444:444 -> a
+    104:104:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):633 -> a
+    105:114:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):634:643 -> a
+    115:128:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):693:706 -> a
+    129:129:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):703:703 -> a
+    130:141:void tryAddToBiggestSavings(java.util.Set,java.util.PriorityQueue,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,int):716:727 -> a
+    142:149:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):732:739 -> a
+    150:150:int codeUnitMargin():746:746 -> a
+    151:151:int lambda$rewriteSwitch$1(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):908:908 -> a
+    152:152:void lambda$removeSwitchMaps$2(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1082:1082 -> a
+    153:153:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1146:1146 -> a
+    154:154:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1145:1145 -> a
+    155:161:com.android.tools.r8.graph.DexType getArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1156:1162 -> a
+    155:161:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1149 -> a
+    162:162:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1149:1149 -> a
+    163:167:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1148:1152 -> a
+    168:175:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1306:1313 -> a
+    176:176:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    176:176:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1313 -> a
+    177:179:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1317:1319 -> a
+    180:180:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
+    180:180:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1324 -> a
+    181:185:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1325:1329 -> a
+    186:186:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    186:186:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1330 -> a
+    187:199:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1330:1342 -> a
+    200:200:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    200:200:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1341 -> a
+    201:201:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1340:1340 -> a
+    202:212:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1482:1492 -> a
+    213:213:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    213:213:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1493 -> a
+    214:233:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1494:1513 -> a
+    234:249:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1512:1527 -> a
+    250:250:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    250:250:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1528 -> a
+    251:267:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1529:1545 -> a
+    268:268:boolean lambda$removeInstanceOfInstructionIfTrivial$3(com.android.tools.r8.ir.code.Value):1524:1524 -> a
+    269:271:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1552:1554 -> a
+    272:272:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    272:272:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1554 -> a
+    273:274:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1556:1557 -> a
+    275:285:void removeOrReplaceByDebugLocalWrite(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1562:1572 -> a
+    286:287:boolean lambda$shortenLiveRanges$5(com.android.tools.r8.ir.code.ConstInstruction):1738:1739 -> a
+    288:380:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1802:1894 -> a
+    381:393:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):1899:1911 -> a
+    394:396:boolean lambda$insertConstantInBlock$8(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):1905:1907 -> a
+    397:397:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():1234:1234 -> a
+    397:397:boolean lambda$insertConstantInBlock$8(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):1908 -> a
+    398:398:boolean lambda$insertConstantInBlock$8(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):1908:1908 -> a
+    399:446:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):1946:1993 -> a
+    447:452:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2321:2326 -> a
+    453:453:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2342:2342 -> a
+    454:460:boolean hasCSECandidate(com.android.tools.r8.ir.code.IRCode,int):2330:2336 -> a
+    454:460:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2343 -> a
+    461:463:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2345:2347 -> a
+    464:464:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
+    464:464:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2347 -> a
+    465:478:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2348:2361 -> a
+    479:488:boolean shareCatchHandlers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2308:2317 -> a
+    479:488:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2362 -> a
+    489:504:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2363:2378 -> a
+    505:506:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2509:2510 -> a
+    507:507:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2675:2675 -> a
+    508:508:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> a
+    508:508:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2675 -> a
+    509:510:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2675:2676 -> a
+    511:538:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2686:2713 -> a
+    539:539:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> a
+    539:539:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2717 -> a
+    540:554:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2732:2746 -> a
+    555:580:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):2920:2945 -> a
+    581:583:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):2956:2958 -> a
+    584:586:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98:100 -> a
+    584:586:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):2958 -> a
+    587:588:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):2959:2960 -> a
+    589:609:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3117:3137 -> a
+    610:610:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):40:40 -> a
+    610:610:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3137 -> a
+    611:627:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3137:3153 -> a
+    628:628:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3152:3152 -> a
+    629:629:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    629:629:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3151 -> a
+    630:641:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3151:3162 -> a
+    642:664:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3173:3195 -> a
+    665:665:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167:167 -> a
+    665:665:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3195 -> a
+    666:666:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3196:3196 -> a
+    667:701:java.util.Set computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3233:3267 -> a
+    667:701:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3200 -> a
+    702:724:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3201:3223 -> a
+    725:725:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):168:168 -> a
+    725:725:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3223 -> a
+    726:730:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3278:3282 -> a
+    731:731:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167:167 -> a
+    731:731:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3282 -> a
+    732:736:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3283:3287 -> a
+    737:737:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3340:3340 -> a
+    738:742:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3346:3350 -> a
+    738:742:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3342 -> a
+    743:743:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    743:743:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3350 -> a
+    743:743:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3342 -> a
+    744:744:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3355:3355 -> a
+    744:744:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3342 -> a
+    745:745:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3352:3352 -> a
+    745:745:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3342 -> a
+    746:746:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    746:746:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3352 -> a
+    746:746:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3342 -> a
+    747:747:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3352:3352 -> a
+    747:747:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3342 -> a
+    748:749:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3361:3362 -> a
+    750:750:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    750:750:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3363 -> a
+    751:751:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3365:3365 -> a
+    752:752:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    752:752:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3365 -> a
+    753:754:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3365:3366 -> a
+    755:775:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3376:3396 -> a
+    776:776:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    776:776:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3395 -> a
+    777:783:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3398:3404 -> a
+    784:822:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3402:3440 -> a
+    823:826:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata):1392:1395 -> a
+    823:826:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3440 -> a
+    827:849:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3441:3463 -> a
+    850:850:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    850:850:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3463 -> a
+    851:852:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3464:3465 -> a
+    853:868:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3464:3479 -> a
+    869:876:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3483:3490 -> a
+    877:887:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3503:3513 -> a
+    877:887:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    888:888:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3491:3491 -> a
+    889:914:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):3536:3561 -> a
+    889:914:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3491 -> a
+    915:919:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3492:3496 -> a
+    920:920:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3493:3493 -> a
+    921:921:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    921:921:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3493 -> a
+    922:922:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    922:922:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    922:922:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3493 -> a
+    923:923:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3493:3493 -> a
+    924:924:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3511:3511 -> a
+    924:924:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    925:925:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    925:925:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3511 -> a
+    925:925:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    926:926:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    926:926:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    926:926:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3511 -> a
+    926:926:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    927:927:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3511:3511 -> a
+    927:927:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    928:928:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3507:3507 -> a
+    928:928:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    929:929:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    929:929:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3507 -> a
+    929:929:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    930:930:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    930:930:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    930:930:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3507 -> a
+    930:930:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    931:931:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3507:3507 -> a
+    931:931:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    932:938:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):3517:3523 -> a
+    1:2:boolean isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):300:301 -> b
+    3:12:void unlinkTrivialGotoBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):340:349 -> b
+    13:13:boolean lambda$shortenLiveRanges$6(com.android.tools.r8.ir.code.ConstInstruction):1747:1747 -> b
+    14:60:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2757:2803 -> b
+    61:62:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1055:1056 -> b
+    61:62:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2803 -> b
+    63:74:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2804:2815 -> b
+    75:75:boolean lambda$logArgumentTypes$12(com.android.tools.r8.ir.code.Instruction):3385:3385 -> b
+    76:78:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$13():3624:3626 -> b
+    79:79:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$13():3624:3624 -> b
+    1:4:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1660:1663 -> c
+    5:13:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1678:1686 -> c
+    5:13:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
+    14:14:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> c
+    14:14:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1686 -> c
+    14:14:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
+    15:17:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1686:1688 -> c
+    15:17:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
+    18:25:boolean hasPath(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):1709:1716 -> c
+    18:25:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1689 -> c
+    18:25:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
+    26:27:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1694:1695 -> c
+    26:27:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
+    28:28:java.util.List lambda$shortenLiveRangesInsideBlock$7(com.android.tools.r8.ir.code.BasicBlock):1888:1888 -> c
+    29:79:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2535:2585 -> c
+    80:80:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> c
+    80:80:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2586 -> c
+    81:90:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2588:2597 -> c
+    91:91:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2596:2596 -> c
+    92:92:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> c
+    92:92:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2603 -> c
+    93:93:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2606:2606 -> c
+    94:107:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2605:2618 -> c
+    108:108:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2617:2617 -> c
+    109:109:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> c
+    109:109:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2624 -> c
+    110:110:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2627:2627 -> c
+    111:130:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2626:2645 -> c
+    1:1:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):167:167 -> d
+    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> d
+    2:2:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):169 -> d
+    3:25:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):171:193 -> d
+    26:26:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1089:1089 -> d
+    26:26:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):205 -> d
+    27:28:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):208:209 -> d
     29:29:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> d
-    29:29:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):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():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
+    29:29:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):209 -> d
+    30:33:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):209:212 -> d
+    34:34:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> d
+    34:34:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):169 -> d
+    1:6:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1049:1054 -> e
     7:45:com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo com.android.tools.r8.ir.optimize.SwitchUtils.analyzeSwitchOverEnum(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):63:101 -> e
-    7:45:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1070 -> e
-    46:53:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1072:1079 -> e
+    7:45:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1054 -> e
+    46:53:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1056:1063 -> e
     54:54:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> e
     54:54:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> e
-    54:54:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1079 -> e
-    55:66:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1080:1091 -> e
+    54:54:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1063 -> e
+    55:66:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1064:1075 -> e
     67:67:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> e
-    67:67:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):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
+    67:67:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1077 -> e
+    68:76:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1080:1088 -> e
+    1:27:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1354:1380 -> f
     28:28:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> f
-    28:28:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):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():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
+    28:28:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1380 -> f
+    29:29:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1381:1381 -> f
+    30:30:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> f
+    30:30:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1382 -> f
+    31:36:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1384:1389 -> f
+    37:53:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1418:1434 -> f
+    37:53:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
     54:54:boolean com.android.tools.r8.graph.DexType.isFloatType():216:216 -> f
-    54:54:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):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
-    55:92:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2013 -> f
+    54:54:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1434 -> f
+    54:54:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    55:92:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1435:1472 -> f
+    55:92:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
     93:93:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> f
-    93:93:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):2096 -> f
-    93:93:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):2013 -> f
-    94:96:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):2096:2098 -> f
-    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():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():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():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
+    93:93:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1472 -> f
+    93:93:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    94:96:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1472:1474 -> f
+    94:96:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    97:119:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1390:1412 -> f
+    1:1:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3011:3011 -> g
+    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> g
+    2:2:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3015 -> g
+    3:65:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3016:3078 -> g
+    1:1:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> h
+    1:1:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3082 -> h
+    2:26:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3083:3107 -> h
+    27:27:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> h
+    27:27:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3108 -> h
+    28:32:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3109:3113 -> h
+    1:1:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1167:1167 -> i
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> i
+    2:2:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1167 -> i
+    3:36:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1170:1203 -> i
+    37:91:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1202:1256 -> i
     92:92:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> i
-    92:92:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):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
-    15:22:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1017:1024 -> j
-    15:22:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):874 -> j
-    23:25:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.IntSwitch,int):1043:1045 -> j
-    23:25:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1028 -> j
-    23:25:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):874 -> j
-    26:34:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1029:1037 -> j
-    26:34:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):874 -> j
-    35:87:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):876:928 -> j
-    88:88:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
-    88:88:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):928 -> j
-    89:103:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):929:943 -> j
-    104:104:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
-    104:104:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):943 -> j
-    105:141:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):945:981 -> j
-    142:142:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
-    142:142:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):981 -> j
-    143:143:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):983:983 -> j
-    144:158:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):767:781 -> j
-    144:158:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):984 -> j
-    159:159:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> j
-    159:159:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):781 -> j
-    159:159:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):984 -> j
-    160:171:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):787:798 -> j
-    160:171:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):984 -> j
-    172:172:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
-    172:172:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):798 -> j
-    172:172:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):984 -> j
-    173:222:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):799:848 -> j
-    173:222:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):984 -> j
-    223:223:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> j
-    223:223:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):849 -> j
-    223:223:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):984 -> j
-    224:224:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):854:854 -> j
-    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):3926:3965 -> l
-    1:55:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2353:2407 -> m
+    92:92:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1256 -> i
+    93:95:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1256:1258 -> i
+    1:14:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):843:856 -> j
+    15:22:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1001:1008 -> j
+    15:22:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):858 -> j
+    23:25:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.IntSwitch,int):1027:1029 -> j
+    23:25:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1012 -> j
+    23:25:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):858 -> j
+    26:34:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1013:1021 -> j
+    26:34:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):858 -> j
+    35:59:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):860:884 -> j
+    60:60:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> j
+    60:60:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):884 -> j
+    61:88:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):885:912 -> j
+    89:89:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
+    89:89:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):912 -> j
+    90:104:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):913:927 -> j
+    105:105:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
+    105:105:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):927 -> j
+    106:142:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):929:965 -> j
+    143:143:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
+    143:143:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):965 -> j
+    144:144:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):967:967 -> j
+    145:159:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):751:765 -> j
+    145:159:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    160:160:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> j
+    160:160:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):765 -> j
+    160:160:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    161:172:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):771:782 -> j
+    161:172:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    173:173:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
+    173:173:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):782 -> j
+    173:173:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    174:223:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):783:832 -> j
+    174:223:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    224:224:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> j
+    224:224:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):833 -> j
+    224:224:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    225:225:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):838:838 -> j
+    225:225:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    226:250:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):972:996 -> j
+    1:58:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):239:296 -> k
+    1:17:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3297:3313 -> l
+    18:18:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> l
+    18:18:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3320 -> l
+    19:34:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3321:3336 -> l
+    1:55:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1724:1778 -> m
     56:56:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> m
-    56:56:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2407 -> m
+    56:56:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1778 -> m
     57:57:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> m
-    57:57:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):2408 -> m
-    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():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
-    12:28:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2664 -> n
-    29:45:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2667:2683 -> n
-    46:63:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2682:2699 -> n
-    64:80:short[] computeArrayFilledData(com.android.tools.r8.ir.code.ConstInstruction[],int,int):2548:2564 -> n
-    64:80:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2700 -> n
-    81:127:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2704:2750 -> n
-    1:6:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2787:2792 -> o
-    7:25:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2831:2849 -> o
-    7:25:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2792 -> o
-    26:36:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2797:2807 -> o
-    37:59:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2756:2778 -> o
-    37:59:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2809 -> o
-    60:73:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2810:2823 -> o
-    74:74:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2783:2783 -> o
-    74:74:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2809 -> o
-    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
+    57:57:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1779 -> m
+    58:60:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1780:1782 -> m
+    61:87:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1767:1793 -> m
+    1:1:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2023:2023 -> n
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> n
+    2:2:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2023 -> n
+    3:11:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2026:2034 -> n
+    12:28:boolean allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):1999:2015 -> n
+    12:28:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2035 -> n
+    29:45:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2038:2054 -> n
+    46:63:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2053:2070 -> n
+    64:80:short[] computeArrayFilledData(com.android.tools.r8.ir.code.ConstInstruction[],int,int):1919:1935 -> n
+    64:80:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2071 -> n
+    81:127:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2075:2121 -> n
+    1:6:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2158:2163 -> o
+    7:25:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2202:2220 -> o
+    7:25:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2163 -> o
+    26:36:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2168:2178 -> o
+    37:59:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2127:2149 -> o
+    37:59:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2180 -> o
+    60:73:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2181:2194 -> o
+    74:74:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2154:2154 -> o
+    74:74:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2180 -> o
+    1:6:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2382:2387 -> p
+    7:21:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2990:3004 -> p
+    7:21:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2388 -> p
     22:24:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98:100 -> p
-    22:24:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):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
-    25:25:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3017 -> p
-    26:37:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3593:3604 -> p
-    26:37:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3018 -> p
+    22:24:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3005 -> p
+    22:24:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2388 -> p
+    25:25:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3006:3006 -> p
+    25:25:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2388 -> p
+    26:37:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2964:2975 -> p
+    26:37:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
     38:51:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():27:40 -> p
-    38:51:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3604 -> p
-    38:51:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3018 -> p
+    38:51:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    38:51:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
     52:52:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():38:38 -> p
-    52:52:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3604 -> p
-    52:52:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3018 -> p
+    52:52:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    52:52:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
     53:53:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():36:36 -> p
-    53:53:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3604 -> p
-    53:53:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3018 -> p
+    53:53:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    53:53:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
     54:54:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():34:34 -> p
-    54:54:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3604 -> p
-    54:54:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3018 -> p
+    54:54:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    54:54:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
     55:55:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():32:32 -> p
-    55:55:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3604 -> p
-    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
+    55:55:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    55:55:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    56:56:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975:2975 -> p
+    56:56:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
     57:59:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98:100 -> p
-    57:59:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):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
+    57:59:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2976 -> p
+    57:59:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    60:64:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2977:2981 -> p
+    60:64:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
     65:67:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98:100 -> p
-    65:67:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):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
-    68:68:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3018 -> p
-    69:71:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3478:3480 -> p
-    69:71:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3020 -> p
-    72:72:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1009:1009 -> p
-    72:72:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3480 -> p
-    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():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
-    109:130:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3020 -> p
-    131:155:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3025:3049 -> p
-    156:156:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):3143:3143 -> p
-    156:156:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3050 -> p
-    157:171:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3053:3067 -> p
-    172:172:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):3143:3143 -> p
-    172:172:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3068 -> p
-    173:173:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3059:3059 -> p
-    174:174:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):3143:3143 -> p
-    174:174:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3060 -> p
-    175:185:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3075:3085 -> p
-    186:186:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):3143:3143 -> p
-    186:186:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3086 -> p
-    187:202:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3089:3104 -> p
-    203:203:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):3143:3143 -> p
-    203:203:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3105 -> p
-    204:204:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3095:3095 -> p
-    205:205:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):3143:3143 -> p
-    205:205:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3096 -> p
-    206:209:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3115:3118 -> p
-    210:210:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):3143:3143 -> p
-    210:210:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3119 -> p
-    211:211:void simplifyIf(com.android.tools.r8.ir.code.IRCode):3121:3121 -> p
-    212:212:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):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
+    65:67:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2982 -> p
+    65:67:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    68:68:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2983:2983 -> p
+    68:68:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    69:71:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2849:2851 -> p
+    69:71:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    72:72:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> p
+    72:72:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2851 -> p
+    72:72:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    73:107:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2852:2886 -> p
+    73:107:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    108:108:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> p
+    108:108:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2887 -> p
+    108:108:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    109:130:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2889:2910 -> p
+    109:130:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    131:155:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2396:2420 -> p
+    156:156:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    156:156:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2421 -> p
+    157:171:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2424:2438 -> p
+    172:172:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    172:172:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2439 -> p
+    173:173:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2430:2430 -> p
+    174:174:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    174:174:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2431 -> p
+    175:185:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2446:2456 -> p
+    186:186:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    186:186:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2457 -> p
+    187:202:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2460:2475 -> p
+    203:203:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    203:203:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2476 -> p
+    204:204:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2466:2466 -> p
+    205:205:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    205:205:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2467 -> p
+    206:209:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2486:2489 -> p
+    210:210:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    210:210:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2490 -> p
+    211:211:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2492:2492 -> p
+    212:212:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    212:212:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2493 -> p
+    213:215:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2499:2501 -> p
     216:216:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> p
-    216:216:void simplifyIf(com.android.tools.r8.ir.code.IRCode):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):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
-    35:35:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1134:1134 -> t
-    36:49:void collapseNonFallthroughSwitchTargets(com.android.tools.r8.ir.code.BasicBlock):395:408 -> t
-    36:49:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1135 -> t
-    50:66:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1139:1155 -> t
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):3280:3280 -> u
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$12(com.android.tools.r8.ir.code.IRCode):3175 -> u
+    216:216:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2501 -> p
+    217:219:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2501:2503 -> p
+    1:30:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1580:1609 -> q
+    1:26:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1620:1645 -> r
+    27:45:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1633:1651 -> r
+    1:46:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3623:3668 -> s
+    1:15:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1101:1115 -> t
+    16:34:void collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):355:373 -> t
+    16:34:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1116 -> t
+    35:35:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1118:1118 -> t
+    36:49:void collapseNonFallthroughSwitchTargets(com.android.tools.r8.ir.code.BasicBlock):379:392 -> t
+    36:49:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1119 -> t
+    50:66:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1123:1139 -> t
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2651:2651 -> u
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2546 -> u
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.<init>():119:119 -> u
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):3280 -> u
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$12(com.android.tools.r8.ir.code.IRCode):3175 -> u
-    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):3283:3296 -> u
-    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$12(com.android.tools.r8.ir.code.IRCode):3175 -> u
-    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$13(com.android.tools.r8.ir.code.IRCode):3176:3176 -> v
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2651 -> u
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2546 -> u
+    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2654:2667 -> u
+    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2546 -> u
+    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$11(com.android.tools.r8.ir.code.IRCode):2547:2547 -> v
     2:2:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> v
-    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$13(com.android.tools.r8.ir.code.IRCode):3176 -> v
-    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$6(com.android.tools.r8.ir.code.IRCode):2354:2354 -> w
+    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$11(com.android.tools.r8.ir.code.IRCode):2547 -> v
+    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.IRCode):1725:1725 -> w
     2:2:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> w
-    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$6(com.android.tools.r8.ir.code.IRCode):2354 -> w
-    1:13:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):232:244 -> x
-    14:20:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):241:247 -> x
+    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.IRCode):1725 -> w
+    1:13:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):216:228 -> x
+    14:20:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):225:231 -> x
 com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.ir.optimize.h$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
-    1:1:void <clinit>():3053:3053 -> <clinit>
+    1:1:void <clinit>():2424:2424 -> <clinit>
 com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.ir.optimize.h$b:
     com.android.tools.r8.utils.InternalOptions options -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():2853:2853 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.CodeRewriter$1):2853:2853 -> <init>
-    2:3:void <init>(com.android.tools.r8.utils.InternalOptions):2857:2858 -> <init>
-    1:6:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2917:2922 -> a
-    7:11:int getHashCode(com.android.tools.r8.ir.code.Value):2928:2932 -> a
-    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):2853:2853 -> doEquivalent
-    2:2:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2866:2866 -> doEquivalent
-    2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):2853 -> doEquivalent
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1204:1204 -> doEquivalent
-    3:3:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2866 -> doEquivalent
-    3:3:boolean doEquivalent(java.lang.Object,java.lang.Object):2853 -> doEquivalent
-    4:19:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2870:2885 -> doEquivalent
-    4:19:boolean doEquivalent(java.lang.Object,java.lang.Object):2853 -> doEquivalent
-    1:1:int doHash(java.lang.Object):2853:2853 -> doHash
-    2:16:int doHash(com.android.tools.r8.ir.code.Instruction):2896:2910 -> doHash
-    2:16:int doHash(java.lang.Object):2853 -> doHash
+    1:1:void <clinit>():2224:2224 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.CodeRewriter$1):2224:2224 -> <init>
+    2:3:void <init>(com.android.tools.r8.utils.InternalOptions):2228:2229 -> <init>
+    1:6:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2288:2293 -> a
+    7:11:int getHashCode(com.android.tools.r8.ir.code.Value):2299:2303 -> a
+    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):2224:2224 -> doEquivalent
+    2:2:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2237:2237 -> doEquivalent
+    2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):2224 -> doEquivalent
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1206:1206 -> doEquivalent
+    3:3:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2237 -> doEquivalent
+    3:3:boolean doEquivalent(java.lang.Object,java.lang.Object):2224 -> doEquivalent
+    4:19:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2241:2256 -> doEquivalent
+    4:19:boolean doEquivalent(java.lang.Object,java.lang.Object):2224 -> doEquivalent
+    1:1:int doHash(java.lang.Object):2224:2224 -> doHash
+    2:16:int doHash(com.android.tools.r8.ir.code.Instruction):2267:2281 -> doHash
+    2:16:int doHash(java.lang.Object):2224 -> doHash
 com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.ir.optimize.h$c:
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> g
     com.android.tools.r8.ir.code.BasicBlock target -> f
@@ -31363,64 +31418,60 @@
     com.android.tools.r8.ir.code.IRCode code -> c
     boolean $assertionsDisabled -> h
     int right -> e
-    1:1:void <clinit>():525:525 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRCode):533:534 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setLeft(com.android.tools.r8.ir.code.Value):543:543 -> a
-    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):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
+    1:1:void <clinit>():509:509 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRCode):517:518 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setLeft(com.android.tools.r8.ir.code.Value):527:527 -> a
+    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setRight(int):532:532 -> a
+    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):542:542 -> a
+    4:9:com.android.tools.r8.ir.code.BasicBlock build():547:552 -> a
+    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    10:10:com.android.tools.r8.ir.code.BasicBlock build():552 -> a
+    11:16:com.android.tools.r8.ir.code.BasicBlock build():553:558 -> a
+    17:20:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata):1392:1395 -> a
+    17:20:com.android.tools.r8.ir.code.BasicBlock build():558 -> a
+    21:23:com.android.tools.r8.ir.code.BasicBlock build():560:562 -> a
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):537:537 -> b
 com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult -> com.android.tools.r8.ir.optimize.h$d:
     com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult FALSE -> c
     com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult TRUE -> b
     com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult UNKNOWN -> a
-    1:3:void <clinit>():150:152 -> <clinit>
-    1:1:void <init>(java.lang.String,int):149:149 -> <init>
+    1:3:void <clinit>():134:136 -> <clinit>
+    1:1:void <init>(java.lang.String,int):133:133 -> <init>
 com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.ir.optimize.h$e:
     com.android.tools.r8.ir.code.Position position -> b
     int blockNumber -> a
-    1:2:void <init>(com.android.tools.r8.ir.code.Position):453:454 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect -> com.android.tools.r8.ir.optimize.h$f:
-    com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect NO_EFFECT -> d
-    com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect DESIRED_EFFECT -> a
-    com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect OTHER_EFFECT -> c
-    com.android.tools.r8.ir.optimize.CodeRewriter$InstructionEffect CONDITIONAL_EFFECT -> b
-    1:4:void <clinit>():1542:1545 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1541:1541 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.ir.optimize.h$g:
+    1:2:void <init>(com.android.tools.r8.ir.code.Position):437:438 -> <init>
+com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.ir.optimize.h$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList keys -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():662:662 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):666:666 -> <init>
-    2:8:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):664:670 -> <init>
-    1:1:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):683:683 -> a
-    2:2:int getMax():679:679 -> a
-    2:2:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):683 -> a
-    3:3:int getMin():675:675 -> a
-    3:3:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):683 -> a
-    4:5:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):683:684 -> a
-    6:6:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode):700:700 -> a
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList access$000(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):662:662 -> b
-    2:2:int getMax():679:679 -> b
-    2:2:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):688 -> b
-    3:3:int getMin():675:675 -> b
-    3:3:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):688 -> b
-    4:4:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):689:689 -> b
+    1:1:void <clinit>():646:646 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):650:650 -> <init>
+    2:8:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):648:654 -> <init>
+    1:1:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):667:667 -> a
+    2:2:int getMax():663:663 -> a
+    2:2:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):667 -> a
+    3:3:int getMin():659:659 -> a
+    3:3:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):667 -> a
+    4:5:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):667:668 -> a
+    6:6:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode):684:684 -> a
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList access$000(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):646:646 -> b
+    2:2:int getMax():663:663 -> b
+    2:2:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):672 -> b
+    3:3:int getMin():659:659 -> b
+    3:3:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):672 -> b
+    4:4:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):673:673 -> b
     5:5:int com.android.tools.r8.ir.code.IntSwitch.baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):114:114 -> b
-    5:5:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):693 -> b
-    6:6:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):693:693 -> b
+    5:5:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):677 -> b
+    6:6:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):677:677 -> b
     7:7:int com.android.tools.r8.ir.code.IntSwitch.basePackedSize(com.android.tools.r8.utils.InternalOutputMode):103:103 -> b
-    7:7:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):695 -> b
-    8:8:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):695:695 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult -> com.android.tools.r8.ir.optimize.h$h:
+    7:7:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):679 -> b
+    8:8:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):679:679 -> b
+com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult -> com.android.tools.r8.ir.optimize.h$g:
     com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult NO_REMOVALS -> a
     com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult REMOVED_CAST_DO_NARROW -> b
-    1:2:void <clinit>():1973:1974 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1972:1972 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$SCC -> com.android.tools.r8.ir.optimize.h$i:
+    1:2:void <clinit>():1349:1350 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1348:1348 -> <init>
+com.android.tools.r8.ir.optimize.CodeRewriter$SCC -> com.android.tools.r8.ir.optimize.h$h:
     java.util.Deque unassignedStack -> d
     java.util.Set unassignedSet -> c
     java.util.List components -> f
@@ -31428,26 +31479,26 @@
     java.util.Deque preorderStack -> e
     boolean $assertionsDisabled -> g
     int currentTime -> a
-    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:
+    1:1:void <clinit>():3568:3568 -> <clinit>
+    1:8:void <init>():3568:3575 -> <init>
+    9:9:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter$1):3568:3568 -> <init>
+    1:3:java.util.List computeSCC(com.android.tools.r8.ir.code.Value):3578:3580 -> a
+    1:33:void dfs(com.android.tools.r8.ir.code.Value):3584:3616 -> b
+com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.ir.optimize.h$i:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap keyToTarget -> d
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> e
     com.android.tools.r8.ir.code.Value value -> c
-    1:1:void <init>(com.android.tools.r8.ir.code.Position):471:471 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.Position):467:467 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setValue(com.android.tools.r8.ir.code.Value):480:480 -> a
-    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):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
-    1:1:java.lang.Integer lambda$build$1(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):514:514 -> b
+    1:1:void <init>(com.android.tools.r8.ir.code.Position):455:455 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.Position):451:451 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setValue(com.android.tools.r8.ir.code.Value):464:464 -> a
+    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder addKeyAndTarget(int,com.android.tools.r8.ir.code.BasicBlock):469:469 -> a
+    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):474:474 -> a
+    4:25:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):480:501 -> a
+    26:29:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createSwitchBlock(int,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.IRMetadata):1422:1425 -> a
+    26:29:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):501 -> a
+    30:31:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):502:503 -> a
+    32:32:java.lang.Integer lambda$build$0(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):492:492 -> a
+    1:1:java.lang.Integer lambda$build$1(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):498:498 -> b
 com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.ir.optimize.j:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap histogramOfCanonicalizationCandidatesPerMethod -> e
     boolean $assertionsDisabled -> f
@@ -31534,75 +31585,90 @@
     com.android.tools.r8.graph.DexEncodedMethod method -> c
     com.android.tools.r8.ir.conversion.CallSiteInformation callSiteInformation -> e
     java.util.function.Predicate isProcessedConcurrently -> f
-    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>
+    1:1:void <clinit>():50:50 -> <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):69:77 -> <init>
     com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod) -> 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,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,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
+    1:13:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):94:106 -> a
+    1:13:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):351 -> a
+    14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    14:14:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):106 -> a
+    14:14:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):351 -> a
+    15:30:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):107:122 -> a
+    15:30:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):351 -> a
+    31:31:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):355:355 -> a
+    32:50:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):130:148 -> a
+    32:50:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
+    51:52:boolean isDoubleInliningTarget(com.android.tools.r8.graph.DexEncodedMethod):210:211 -> a
+    51:52:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):150 -> a
+    51:52:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
+    53:55:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):151:153 -> a
+    53:55:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
+    56:57:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):133:134 -> a
+    56:57:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
+    58:59:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):360:361 -> a
+    60:60:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):360:360 -> a
+    61:69:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):219:227 -> a
+    61:69:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365 -> a
+    70:70:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    70:70:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):227 -> a
+    70:70:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365 -> a
+    71:142:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):227:298 -> a
+    71:142:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365 -> a
+    143:145:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):297:299 -> a
+    143:145:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365 -> a
+    146:146:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):369:369 -> a
+    147:149:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):95:97 -> a
+    147:149:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):351 -> a
+    150:154:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):169:173 -> a
+    155:155:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    155:155:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):173 -> a
+    156:166:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):174:184 -> a
+    167:187:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):180:200 -> a
+    188:188:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
+    188:188:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):200 -> a
+    189:189:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):204:204 -> a
+    190:190:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
+    190:190:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):200 -> a
+    191:191:java.lang.Boolean lambda$canInlineStaticInvoke$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):182:182 -> a
+    192:192:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):311:311 -> a
+    193:204:int computeInstructionLimit(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):320:331 -> a
+    193:204:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):312 -> a
+    205:205:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):313:313 -> a
+    206:206:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):342:342 -> a
+    207:208:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):378:379 -> a
+    209:209:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    209:209:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):379 -> a
+    210:216:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):381:387 -> a
+    217:217:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    217:217:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):387 -> a
+    218:229:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):387:398 -> a
+    230:234:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):411:415 -> a
+    235:237:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):421:423 -> a
+    238:238:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    238:238:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):423 -> a
+    239:239:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):425:425 -> a
+    240:331:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):443:534 -> a
+    332:332:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):541:541 -> a
+    333:333:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():561:561 -> a
+    333:333:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):541 -> a
+    334:336:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):544:546 -> a
+    337:337:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():561:561 -> a
+    337:337:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):541 -> a
+    338:338:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):558:558 -> a
+    339:339:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():561:561 -> a
+    339:339:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):558 -> a
+    340:342:boolean willExceedInstructionBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):569:571 -> a
+    340:342:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):561 -> a
+    343:343:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):562:562 -> a
+    344:360:boolean willExceedControlFlowResolutionBlocksBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):656:672 -> a
+    344:360:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):563 -> a
+    361:361:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():561:561 -> a
+    361:361:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):558 -> a
+    362:394:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):591:623 -> a
+    395:395:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):682:682 -> a
+    396:420:void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):688:712 -> a
+    421:428:void insertAssumeInstructionsToInlinee(com.android.tools.r8.ir.optimize.Assumer,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator,java.util.Set):724:731 -> a
 com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.ir.optimize.m:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
@@ -31620,7 +31686,7 @@
     77:77:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):117 -> a
     78:108:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):119:149 -> a
     109:128:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):148:167 -> a
-    129:129:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    129:129:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     129:129:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):174 -> a
     130:152:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):176:198 -> a
     153:153:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
@@ -31656,20 +31722,19 @@
     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>
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):32:35 -> <init>
     boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback) -> a
     boolean isForcedInliningOracle() -> a
     void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason) -> a
     boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     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,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
+    boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
+    1:5:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):45:49 -> a
+    6:16:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvoke(com.android.tools.r8.ir.code.InvokeMethod):62:72 -> a
+    6:16:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):58 -> a
+    17:20:com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod):113:116 -> a
 com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.ir.optimize.r:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -31726,64 +31791,66 @@
     com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> c
     java.util.Set doubleInlineCallers -> f
     boolean applyDoubleInlining -> e
-    java.util.Set blackList -> b
+    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):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
+    1:1:void <clinit>():69:69 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.ir.conversion.LensCodeRewriter):85:85 -> <init>
+    2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.ir.conversion.LensCodeRewriter):77:90 -> <init>
+    1:19:boolean isBlacklisted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):95:113 -> a
+    20:20:boolean isBlacklisted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):108:108 -> a
+    21:21:boolean isDoubleInliningEnabled():121:121 -> a
+    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):135:135 -> a
+    23:23:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    23:23:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1425 -> a
+    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):135 -> a
+    24:24:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1425:1425 -> a
+    24:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):135 -> a
+    25:30:boolean useReflectiveOperationExceptionOrUnknownClassInCatch(com.android.tools.r8.ir.code.IRCode):991:996 -> a
+    25:30:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):136 -> a
+    31:31:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    31:31:boolean useReflectiveOperationExceptionOrUnknownClassInCatch(com.android.tools.r8.ir.code.IRCode):996 -> a
+    31:31:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):136 -> a
+    32:44:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):137:149 -> a
+    45:47:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):127:129 -> a
+    45:47:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):150 -> a
+    48:53:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):151:156 -> a
+    54:58:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):178:182 -> a
+    59:59:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    59:59:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):182 -> a
+    60:60:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):183:183 -> a
+    61:68:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):187:194 -> a
+    69:69:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):85:85 -> a
+    69:69:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):194 -> a
+    70:70:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):85:85 -> a
+    70:70:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):197 -> a
+    71:72:boolean isDoubleInliningTarget(com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.graph.DexEncodedMethod):202:203 -> a
+    73:80:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):238:245 -> a
+    81:94:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):244:257 -> a
+    95:99:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):247:251 -> a
+    100:106:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):247:253 -> a
+    107:131:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):773:797 -> a
+    132:133:void performForcedInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map):822:823 -> a
+    134:142:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):832:840 -> a
+    143:143:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):851:851 -> a
+    143:143:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):834 -> a
+    144:144:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):841:841 -> a
+    145:145:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):851:851 -> a
+    146:185:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):868:907 -> a
+    186:193:com.android.tools.r8.ir.code.Position getPositionForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):979:986 -> a
+    186:193:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):912 -> a
+    194:194:com.android.tools.r8.ir.code.Position getPositionForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):984:984 -> a
+    194:194:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):912 -> a
+    195:195:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):912:912 -> a
+    196:231:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):908:943 -> a
+    232:241:com.android.tools.r8.graph.DexType getDowncastTypeIfNeeded(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):1006:1015 -> a
+    232:241:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):949 -> a
+    242:274:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):943:975 -> a
+    1:7:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):162:168 -> b
+    8:8:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> b
+    8:8:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):168 -> b
+    9:20:void recordDoubleInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):220:231 -> b
+    1:7:boolean satisfiesRequirementsForDoubleInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):208:214 -> c
 com.android.tools.r8.ir.optimize.Inliner$Constraint -> com.android.tools.r8.ir.optimize.Inliner$a:
     com.android.tools.r8.ir.optimize.Inliner$Constraint PACKAGE -> e
     com.android.tools.r8.ir.optimize.Inliner$Constraint SAMENEST -> d
@@ -31794,89 +31861,109 @@
     com.android.tools.r8.ir.optimize.Inliner$Constraint ALWAYS -> g
     com.android.tools.r8.ir.optimize.Inliner$Constraint SUBCLASS -> f
     int value -> a
-    1:17:void <clinit>():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
+    1:17:void <clinit>():267:283 -> <clinit>
+    18:47:void <clinit>():267:296 -> <clinit>
+    1:2:void <init>(java.lang.String,int,int):287:288 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.Inliner$Constraint[] values():267:267 -> a
+    1:1:boolean isSet(int):300:300 -> b
 com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget -> com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget:
     com.android.tools.r8.ir.optimize.Inliner$Constraint constraint -> a
     com.android.tools.r8.graph.DexType targetHolder -> b
     boolean $assertionsDisabled -> c
-    1:9:void <clinit>():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
+    1:9:void <clinit>():318:326 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):328:331 -> <init>
+    5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):334:338 -> <init>
+    1:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):361:363 -> a
     4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):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
+    4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):364 -> a
+    5:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):365:373 -> a
     14:14:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):85:85 -> a
-    14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):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
+    14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):374 -> a
+    15:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):376:380 -> a
     20:20:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):85:85 -> a
-    20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):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
+    20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):383 -> a
+    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):384:384 -> a
+    22:27:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):390:395 -> a
     28:28:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    28:28:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):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
+    28:28:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):398 -> a
+    29:30:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):400:401 -> a
+    1:5:boolean equals(java.lang.Object):351:355 -> equals
+    1:4:int hashCode():343:346 -> hashCode
     5:5:int com.android.tools.r8.graph.DexType.computeHashCode():43:43 -> hashCode
-    5:5:int hashCode():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
+    5:5:int hashCode():346 -> hashCode
+    1:51:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):406:456 -> meet
+    52:52:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):530:530 -> meet
+    52:52:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):456 -> meet
     53:53:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> meet
-    53:53:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):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
+    53:53:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):531 -> meet
+    53:53:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):456 -> meet
+    54:59:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):532:537 -> meet
+    54:59:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):456 -> meet
     60:60:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> meet
-    60:60:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):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
+    60:60:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):537 -> meet
+    60:60:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):456 -> meet
+    61:63:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):538:540 -> meet
+    61:63:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):456 -> meet
+    64:71:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):457:464 -> meet
     72:72:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> meet
-    72:72:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):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
+    72:72:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):507 -> meet
+    72:72:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):464 -> meet
+    73:80:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):509:516 -> meet
+    73:80:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):464 -> meet
     81:81:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> meet
-    81:81:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):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
+    81:81:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):516 -> meet
+    81:81:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):464 -> meet
+    82:86:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):518:522 -> meet
+    82:86:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):464 -> meet
+    87:121:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):468:502 -> meet
 com.android.tools.r8.ir.optimize.Inliner$InlineAction -> com.android.tools.r8.ir.optimize.Inliner$b:
     com.android.tools.r8.graph.DexEncodedMethod target -> a
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> b
     boolean shouldSynthesizeNullCheckForReceiver -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():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
+    1:1:void <clinit>():565:565 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):573:576 -> <init>
+    1:1:void setShouldSynthesizeNullCheckForReceiver():580:580 -> a
+    2:17:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):589:604 -> a
+    18:18:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    18:18:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):604 -> a
+    19:43:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):605:629 -> a
+    44:46:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98:100 -> a
+    44:46:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):630 -> a
+    47:64:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):631:648 -> a
+    65:89:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):647:671 -> a
+    90:95:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):670:675 -> a
+    96:96:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    96:96:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):677 -> a
+    97:97:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):677:677 -> a
+    98:109:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):675:686 -> a
+    110:110:com.android.tools.r8.ir.code.Phi com.android.tools.r8.ir.code.IRCode.createPhi(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1036:1036 -> a
+    110:110:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):688 -> a
+    111:112:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):689:690 -> a
+    113:113:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):130:130 -> a
+    113:113:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):692 -> a
+    114:143:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):696:725 -> a
+    144:144:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):724:724 -> a
+    145:145:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    145:145:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):723 -> a
+    146:176:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):726:756 -> a
+    177:177:com.android.tools.r8.ir.code.Value lambda$buildInliningIR$0(com.android.tools.r8.ir.code.BasicBlock):691:691 -> a
 com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason -> com.android.tools.r8.ir.optimize.s:
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> a
     com.android.tools.r8.ir.code.IRCode code -> b
-    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner$Reason):632:634 -> <init>
+    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner$Reason):765:767 -> <init>
 com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.ir.optimize.t:
     com.android.tools.r8.graph.DexEncodedMethod target -> a
     com.android.tools.r8.graph.DexType receiverType -> b
-    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):678:680 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):811:813 -> <init>
 com.android.tools.r8.ir.optimize.Inliner$Reason -> com.android.tools.r8.ir.optimize.Inliner$c:
     com.android.tools.r8.ir.optimize.Inliner$Reason SIMPLE -> e
     com.android.tools.r8.ir.optimize.Inliner$Reason SINGLE_CALLER -> c
     com.android.tools.r8.ir.optimize.Inliner$Reason DUAL_CALLER -> d
     com.android.tools.r8.ir.optimize.Inliner$Reason FORCE -> a
     com.android.tools.r8.ir.optimize.Inliner$Reason ALWAYS -> b
-    1:5:void <clinit>():542:546 -> <clinit>
-    1:1:void <init>(java.lang.String,int):541:541 -> <init>
+    1:5:void <clinit>():553:557 -> <clinit>
+    1:1:void <init>(java.lang.String,int):552:552 -> <init>
 com.android.tools.r8.ir.optimize.InliningConstraints -> com.android.tools.r8.ir.optimize.u:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.GraphLense graphLense -> c
@@ -31911,22 +31998,22 @@
     39:41:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):158:160 -> a
     42:42:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):159:159 -> a
     43:43:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):191:191 -> a
-    44:45:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):286:287 -> a
+    44:45:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):285:286 -> a
     46:46:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    46:46:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):287 -> a
-    47:60:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):289:302 -> a
-    61:74:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):300:313 -> a
-    75:80:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):318:323 -> a
+    46:46:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):286 -> a
+    47:60:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):288:301 -> a
+    61:74:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forFieldInstruction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):299:312 -> a
+    75:80:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):317:322 -> a
     81:81:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    81:81:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):323 -> a
-    82:98:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):325:341 -> a
-    99:118:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):348:367 -> a
+    81:81:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):322 -> a
+    82:98:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):324:340 -> a
+    99:118:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):347:366 -> a
     119:119:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    119:119:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):367 -> a
-    120:144:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):368:392 -> a
+    119:119:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):366 -> a
+    120:144:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):367:391 -> a
     145:145:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    145:145:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):392 -> a
-    146:151:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):392:397 -> a
+    145:145:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):391 -> a
+    146:151:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forVirtualInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,boolean):391:396 -> a
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):88:88 -> b
     2:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstancePut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):126:128 -> b
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstancePut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):127:127 -> b
@@ -31934,18 +32021,17 @@
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):122:122 -> c
     2:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):184:186 -> c
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):185:185 -> c
-    6:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):248:250 -> c
-    9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):249:249 -> c
+    6:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):247:249 -> c
+    9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticGet(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):248:248 -> c
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeMultiNewArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):172:172 -> d
     2:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):195:196 -> d
-    4:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticPut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):254:256 -> d
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticPut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):255:255 -> d
+    4:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticPut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):253:255 -> d
+    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forStaticPut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):254:254 -> d
     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
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayEmpty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):223:223 -> f
+    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):231:231 -> g
 com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.ir.optimize.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
+    com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     boolean isForcedInliningOracle() -> a
     com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType) -> a
 com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.ir.optimize.w:
@@ -31955,7 +32041,7 @@
     void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason) -> a
     boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     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,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
+    boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
 com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.ir.optimize.x:
     com.android.tools.r8.ir.regalloc.RegisterAllocator allocator -> a
     1:2:void <init>(com.android.tools.r8.ir.regalloc.RegisterAllocator):14:15 -> <init>
@@ -32084,37 +32170,37 @@
     83:85:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):221 -> a
     86:99:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):224:237 -> a
     100:107:void rewriteStaticGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet):341:348 -> a
-    108:140:void rewriteStaticGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet):347:379 -> a
-    141:141:java.lang.Boolean lambda$rewriteStaticGetWithConstantValues$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):348:348 -> a
-    142:156:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):418:432 -> a
-    157:206:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):250:299 -> a
-    157:206:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    207:211:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedMethod):98:102 -> a
-    207:211:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):303 -> a
-    207:211:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    212:218:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):306:312 -> a
-    212:218:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    219:226:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):311:318 -> a
-    219:226:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    227:231:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):190:194 -> a
-    227:231:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):317 -> a
-    227:231:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    232:235:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):192:195 -> a
-    232:235:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):317 -> a
-    232:235:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    236:245:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):191:200 -> a
-    236:245:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):317 -> a
-    236:245:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    246:256:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):321:331 -> a
-    246:256:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):431 -> a
-    257:263:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):433:439 -> a
-    264:272:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):434:442 -> a
-    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):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
+    108:153:void rewriteStaticGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet):347:392 -> a
+    154:154:java.lang.Boolean lambda$rewriteStaticGetWithConstantValues$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):348:348 -> a
+    155:169:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):432:446 -> a
+    170:219:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):250:299 -> a
+    170:219:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    220:224:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedMethod):98:102 -> a
+    220:224:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):303 -> a
+    220:224:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    225:231:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):306:312 -> a
+    225:231:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    232:239:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):311:318 -> a
+    232:239:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    240:244:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):190:194 -> a
+    240:244:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):317 -> a
+    240:244:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    245:248:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):192:195 -> a
+    245:248:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):317 -> a
+    245:248:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    249:258:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):191:200 -> a
+    249:258:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):317 -> a
+    249:258:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    259:269:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):321:331 -> a
+    259:269:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    270:276:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):447:453 -> a
+    277:285:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):448:456 -> a
+    286:307:void rewriteInstanceGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet):401:422 -> a
+    286:307:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):455 -> a
+    308:309:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):460:461 -> a
+    310:310:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    310:310:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):461 -> a
+    311:313:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):461:463 -> a
 com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup -> com.android.tools.r8.ir.optimize.z:
     com.android.tools.r8.shaking.ProguardMemberRule rule -> b
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType type -> a
@@ -32194,7 +32280,7 @@
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():21:21 -> <clinit>
     1:14:boolean sameNest(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):27:40 -> a
-    15:15:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    15:15:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     15:15:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):46 -> a
     16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
     16:16:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):47 -> a
@@ -32213,43 +32299,39 @@
     com.android.tools.r8.graph.AppView appView -> a
     java.util.function.Consumer splitBlockConsumer -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():51:51 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):58:58 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Consumer):61:64 -> <init>
+    1:1:void <clinit>():47:47 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):54:54 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Consumer):57:60 -> <init>
     boolean lambda$addNonNullForValues$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
-    1:73:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):70:142 -> a
+    1:73:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):66:138 -> a
     74:74:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
-    74:74:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):142 -> a
-    75:78:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):143:146 -> a
-    79:85:boolean verifyCompanionClassInstanceIsKnownToBeNonNull(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,java.util.Set):257:263 -> a
-    79:85:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):146 -> a
+    74:74:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):138 -> a
+    75:78:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):139:142 -> a
+    79:85:boolean verifyCompanionClassInstanceIsKnownToBeNonNull(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,java.util.Set):253:259 -> a
+    79:85:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):142 -> a
     86:86:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    86:86:boolean verifyCompanionClassInstanceIsKnownToBeNonNull(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,java.util.Set):263 -> a
-    86:86:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):146 -> a
-    87:88:boolean verifyCompanionClassInstanceIsKnownToBeNonNull(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,java.util.Set):264:265 -> a
-    87:88:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):146 -> a
+    86:86:boolean verifyCompanionClassInstanceIsKnownToBeNonNull(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,java.util.Set):259 -> a
+    86:86:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):142 -> a
+    87:88:boolean verifyCompanionClassInstanceIsKnownToBeNonNull(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,java.util.Set):260:261 -> a
+    87:88:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):142 -> a
     89:89:boolean com.android.tools.r8.graph.DexClass.initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView):784:784 -> a
-    89:89:boolean verifyCompanionClassInstanceIsKnownToBeNonNull(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,java.util.Set):266 -> a
-    89:89:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):146 -> a
-    90:98:boolean verifyCompanionClassInstanceIsKnownToBeNonNull(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,java.util.Set):267:275 -> a
-    90:98:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):146 -> a
-    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
+    89:89:boolean verifyCompanionClassInstanceIsKnownToBeNonNull(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,java.util.Set):262 -> a
+    89:89:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):142 -> a
+    90:98:boolean verifyCompanionClassInstanceIsKnownToBeNonNull(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,java.util.Set):263:271 -> a
+    90:98:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):142 -> a
+    99:100:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):153:154 -> a
+    101:175:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):153:227 -> a
+    176:196:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):225:245 -> 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
-    260:278: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):361:379 -> a
-    279:284:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):387:392 -> a
+    197:197:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):245 -> a
+    198:198:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):245:245 -> 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):299:359 -> a
+    260:278:void addNonNullForValues(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,java.util.Set,java.util.Set):357:375 -> a
+    279:284:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):383:388 -> a
     285:285:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
-    285:285:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):392 -> a
-    286:294:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):394:402 -> a
-    295:298:boolean isNullableReferenceTypeWithUsers(com.android.tools.r8.ir.code.Value):411:414 -> a
-    299:330:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):418:449 -> a
-    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
+    285:285:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):388 -> a
+    286:294:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):390:398 -> a
+    295:298:boolean isNullableReferenceTypeWithUsers(com.android.tools.r8.ir.code.Value):407:410 -> a
 com.android.tools.r8.ir.optimize.Outliner -> com.android.tools.r8.ir.optimize.L:
     java.util.List candidateMethodLists -> a
     java.util.Map outlineSites -> c
@@ -32269,7 +32351,7 @@
     20:20:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.Outliner$Outline.buildMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):581:581 -> a
     20:20:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1333 -> a
     21:30:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1334:1343 -> a
-    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     31:31:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1343 -> a
     32:63:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1344:1375 -> a
     64:70:void applyOutliningCandidate(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1392:1398 -> a
@@ -32441,8 +32523,10 @@
     int argumentsMapIndex -> t
     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
+    1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1200:1202 -> a
+    4:6:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1266:1268 -> a
+    4:6:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1202 -> a
+    7:63:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1203:1259 -> 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):1169:1170 -> <init>
@@ -32504,7 +32588,7 @@
     5:10:java.util.List orderedInValues(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):767:772 -> a
     11:23:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):918:930 -> a
     24:30:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):935:941 -> a
-    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     31:31:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):941 -> a
     32:38:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):945:951 -> a
     39:71:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):957:989 -> a
@@ -32571,7 +32655,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():1478:1478 -> a
+    315:315:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
     315:315:com.android.tools.r8.ir.code.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
@@ -32583,13 +32667,13 @@
     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():1478:1478 -> a
+    390:390:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
     390:390:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):454 -> a
-    391:391:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1478:1478 -> a
+    391:391:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
     391:391:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):454 -> a
     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():1478:1478 -> a
+    408:408:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> 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
@@ -32700,7 +32784,7 @@
     2:8:void <init>(com.android.tools.r8.graph.AppView):71:77 -> <init>
     1:1:com.android.tools.r8.graph.DexProgramClass getSynthesizedClass():81:81 -> a
     2:2:void rewrite(com.android.tools.r8.ir.code.IRCode):85:85 -> a
-    3:3:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    3:3:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     3:3:void rewrite(com.android.tools.r8.ir.code.IRCode):86 -> a
     4:72:void rewrite(com.android.tools.r8.ir.code.IRCode):87:155 -> a
     73:73:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
@@ -32738,7 +32822,7 @@
     247:248:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225:226 -> a
     247:248:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
     249:249:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):172:172 -> a
-    250:250:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    250:250:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     250:250:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):172 -> a
     251:251:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):173:173 -> a
 com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.ir.optimize.a0:
@@ -32902,20 +32986,22 @@
     2:2:com.android.tools.r8.utils.MethodSignatureEquivalence access$100():45:45 -> a
     3:9:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):98:104 -> a
     10:36:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):98:124 -> a
-    37:37:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217:217 -> a
-    38:69:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):280:311 -> a
-    70:70:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo.builder():119:119 -> a
-    70:70:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):313 -> a
-    71:73:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):314:316 -> a
-    74:81:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):312:319 -> a
-    82:100:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):326:344 -> a
-    1:8:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):221:228 -> b
-    9:9:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod):275:275 -> b
-    9:9:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):229 -> b
-    10:22:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):230:242 -> b
-    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
+    37:44:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):221:228 -> a
+    37:44:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    45:45:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod):275:275 -> a
+    45:45:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):229 -> a
+    45:45:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    46:58:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):230:242 -> a
+    46:58:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    59:90:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):280:311 -> a
+    91:91:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo.builder():119:119 -> a
+    91:91:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):313 -> a
+    92:94:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):314:316 -> a
+    95:102:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):312:319 -> a
+    103:121:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):326:344 -> a
+    1:18:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):248:265 -> b
+    19:24:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):264:269 -> b
+    1:1:java.lang.Runnable runnableForClass(com.android.tools.r8.graph.DexProgramClass):217:217 -> c
 com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1 -> com.android.tools.r8.ir.optimize.j0:
 com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> com.android.tools.r8.ir.optimize.k0:
     java.util.BitSet used -> a
@@ -32967,7 +33053,7 @@
     51:53:void logIneligibleUser(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionOrPhi):77:79 -> a
     51:53:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):218 -> a
     54:63:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):223:232 -> a
-    64:64:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1017:1017 -> a
+    64:64:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1089:1089 -> a
     64:64:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):233 -> a
     65:66:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):234:235 -> a
     67:67:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
@@ -33033,7 +33119,7 @@
     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):959:959 -> b
+    44:44:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> b
     44:44:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):151 -> b
     45:49:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):151:155 -> b
     50:50:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> b
@@ -33062,15 +33148,15 @@
     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.graph.DexEncodedMethod findSingleTarget(com.android.tools.r8.ir.code.InvokeMethod):962:974 -> 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:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):800:819 -> 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:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):847:856 -> a
+    103:112:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):822 -> 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:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):826:837 -> 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
@@ -33088,69 +33174,69 @@
     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):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):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):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
+    178:230:void removeMiscUsages(com.android.tools.r8.ir.code.IRCode):460:512 -> a
+    178:230:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):401 -> a
+    231:247:void removeFieldReads(com.android.tools.r8.ir.code.IRCode):518:534 -> a
+    231:247:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):402 -> a
+    248:263:void removeFieldWrites():563:578 -> a
+    248:263:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):403 -> a
+    264:266:void removeFieldWrites():572:574 -> a
+    264:266:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):403 -> a
+    267:269:void removeFieldWrites():565:567 -> a
+    267:269:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):403 -> a
+    270:270:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):404:404 -> a
+    271:275:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):542:546 -> a
+    276:287:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):545:556 -> a
+    288:288:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    288:288:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):556 -> a
+    289:289:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):557:557 -> a
+    290:290:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    290:290:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):557 -> a
+    291:294:void replaceFieldRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstanceGet,java.util.Map):556:559 -> a
+    295:295:com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper lambda$replaceFieldRead$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField):546:546 -> a
+    296:301: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):584:589 -> a
+    302:334: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):588:620 -> a
+    335:335:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    335:335: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):620 -> a
+    336: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):621:640 -> a
+    356:356:boolean lambda$isEligibleConstructorCall$1(com.android.tools.r8.ir.code.Value):589:589 -> a
+    357:387:boolean isEligibleInvokeWithAllUsersAsReceivers(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set):655:685 -> a
+    357:387:boolean lambda$isEligibleDirectVirtualMethodCall$3(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):703 -> a
+    388: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):694:696 -> a
+    391: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):695:701 -> a
+    398:398: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):699:699 -> a
+    399:401:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod):707:709 -> a
+    402:402:boolean lambda$isEligibleIndirectVirtualMethodCall$4(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):710:710 -> a
+    403:439:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleVirtualMethodCall(boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):720:756 -> a
+    440:452:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):760:772 -> a
+    453:483:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):869:899 -> a
+    484:487:boolean isTrivialInitializer(com.android.tools.r8.graph.DexMethod):930:933 -> a
+    484:487:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):900 -> a
+    488:488:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):163:163 -> a
+    488:488:boolean isTrivialInitializer(com.android.tools.r8.graph.DexMethod):933 -> a
+    488:488:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):900 -> a
+    489:489:boolean isTrivialInitializer(com.android.tools.r8.graph.DexMethod):935:935 -> a
+    489:489:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):900 -> a
+    490:516:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):895:921 -> a
+    517:517:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):917:917 -> a
+    518:531:boolean isEligibleSingleTarget(com.android.tools.r8.graph.DexEncodedMethod):981:994 -> a
+    532:532:boolean isEligibleSingleTarget(com.android.tools.r8.graph.DexEncodedMethod):993:993 -> a
+    533:533:void lambda$removeInstruction$5(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1008:1008 -> a
+    534:535:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1008:1009 -> a
     1:103:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassAndUsageEligible():148:250 -> b
     104:104:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassAndUsageEligible():234:234 -> b
-    105:105: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
+    105:105:boolean lambda$isEligibleDirectVirtualMethodCall$2(com.android.tools.r8.ir.code.Value):696:696 -> b
+    106:113:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):939:946 -> b
+    106:113:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):956 -> 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):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
+    114:114:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):946 -> b
+    114:114:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):956 -> b
+    115:120:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):947:952 -> b
+    115:120:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):956 -> b
     121:121:boolean com.android.tools.r8.kotlin.KotlinSyntheticClass.isLambda():48:48 -> b
-    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
+    121:121:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):952 -> b
+    121:121:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):956 -> b
+    122:122:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):957:957 -> 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():127 -> c
@@ -33295,7 +33381,91 @@
     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.ir.optimize.info.j:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector -> com.android.tools.r8.ir.optimize.info.h:
+    com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
+    com.android.tools.r8.graph.AppView appView -> a
+    com.android.tools.r8.utils.InternalOptions options -> b
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():62:62 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView):67:70 -> <init>
+    1:14:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):109:122 -> a
+    15:15:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    15:15:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):122 -> a
+    16:52:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):129:165 -> a
+    53:96:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):140:183 -> a
+    97:100:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):445:448 -> a
+    101:107:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):447:453 -> a
+    108:108:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):452:452 -> a
+    109:109:boolean triggersClassInitializationBeforeSideEffect(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):465:465 -> a
+    110:126:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$triggersClassInitializationBeforeSideEffect$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):468:484 -> a
+    127:185:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):496:554 -> a
+    186:225:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):515:554 -> a
+    226:238:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):542:554 -> a
+    239:239:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):565:565 -> a
+    240:244:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):568:572 -> a
+    245:260:boolean isKotlinNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):648:663 -> a
+    245:260:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):574 -> a
+    261:280:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):575:594 -> a
+    281:286:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):593:598 -> a
+    287:294:boolean isInstantiationOfNullPointerException(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.graph.DexItemFactory):682:689 -> a
+    287:294:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):598 -> a
+    295:315:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):599:619 -> a
+    316:318:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):671:673 -> a
+    319:337:void computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):701:719 -> a
+    338:344:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):726:732 -> a
+    345:345:boolean lambda$computeMayHaveSideEffects$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):774:774 -> a
+    346:377:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):847:878 -> a
+    378:423:boolean isNormalExitDominated(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):900:945 -> a
+    378:423:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):879 -> a
+    424:429:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):885:890 -> a
+    1:40:void identifyReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):216:255 -> b
+    41:52:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):740:751 -> b
+    53:66:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:54 -> b
+    53:66:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    67:67:com.android.tools.r8.ir.analysis.AbstractError com.android.tools.r8.ir.code.Instruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):539:539 -> b
+    67:67:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):55 -> b
+    67:67:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    68:76:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):55:63 -> b
+    68:76:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    77:103:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56:82 -> b
+    77:103:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    104:159:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis.classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):75:130 -> b
+    104:159:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    160:160:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():31:31 -> b
+    160:160:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):753 -> b
+    161:162:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):754:755 -> b
+    163:163:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.canBePostponed():27:27 -> b
+    163:163:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):756 -> b
+    164:164:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):757:757 -> b
+    165:165:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():31:31 -> b
+    165:165:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):753 -> b
+    166:169:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):762:765 -> b
+    170:170:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):784:784 -> b
+    170:170:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):765 -> b
+    171:171:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> b
+    171:171:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):784 -> b
+    171:171:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):765 -> b
+    172:178:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):786:792 -> b
+    172:178:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):765 -> b
+    179:183:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):773:777 -> b
+    1:17:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):261:277 -> c
+    18:87:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeInstanceInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.function.Function):371:440 -> c
+    18:87:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):277 -> c
+    88:144:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeClassInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):290:346 -> c
+    88:144:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):278 -> c
+    145:202:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeClassInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):296:353 -> c
+    145:202:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):278 -> c
+    203:203:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):274:274 -> c
+    204:226:void computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):820:842 -> c
+    1:7:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):807:813 -> d
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect -> com.android.tools.r8.ir.optimize.info.g:
+    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect DESIRED_EFFECT -> a
+    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect NO_EFFECT -> d
+    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect OTHER_EFFECT -> c
+    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect CONDITIONAL_EFFECT -> b
+    1:4:void <clinit>():638:641 -> <clinit>
+    1:1:void <init>(java.lang.String,int):637:637 -> <init>
+com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo -> com.android.tools.r8.ir.optimize.info.l:
     java.util.Map callSiteInfos -> b
     com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection cachedRepresentative -> c
     boolean $assertionsDisabled -> d
@@ -33323,8 +33493,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.ir.optimize.info.g:
-com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection -> com.android.tools.r8.ir.optimize.info.i:
+com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$1 -> com.android.tools.r8.ir.optimize.info.i:
+com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection -> com.android.tools.r8.ir.optimize.info.k:
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement[] dynamicTypes -> a
     com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection BOTTOM -> b
     boolean $assertionsDisabled -> c
@@ -33342,11 +33512,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.ir.optimize.info.h:
+com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection$1 -> com.android.tools.r8.ir.optimize.info.j:
     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.ir.optimize.info.k:
+com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo -> com.android.tools.r8.ir.optimize.info.m:
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement dynamicType -> d
     boolean cannotBeKept -> b
     boolean valueHasBeenPropagated -> c
@@ -33370,15 +33540,15 @@
     1:1:boolean valueHasBeenPropagated():71:71 -> h
     1:1:void markAsPropagated():75:75 -> i
     1:1:void markCannotBeKept():57:57 -> j
-com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.ir.optimize.info.l:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.ir.optimize.info.n:
     1:1:void <init>():20:20 -> <init>
     1:4:void fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):33:36 -> a
     5:13:void fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):35:43 -> a
     14:15:java.lang.Object lambda$fixupOptimizationInfos$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):38:39 -> a
-com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer -> com.android.tools.r8.ir.optimize.info.l$a:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer -> com.android.tools.r8.ir.optimize.info.n$a:
     void fixup(com.android.tools.r8.graph.DexEncodedField) -> a
     void fixup(com.android.tools.r8.graph.DexEncodedMethod) -> a
-com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed -> com.android.tools.r8.ir.optimize.info.m:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed -> com.android.tools.r8.ir.optimize.info.o:
     java.util.Map fieldOptimizationInfos -> a
     java.util.Map methodOptimizationInfos -> b
     java.util.Map processed -> c
@@ -33454,7 +33624,7 @@
     void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod) -> j
 com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore$1 -> com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore$a:
     1:1:void <init>():22:22 -> <init>
-com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.ir.optimize.info.n:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.ir.optimize.info.p:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple INSTANCE -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():24:24 -> <init>
@@ -33488,7 +33658,7 @@
     void markForceInline(com.android.tools.r8.graph.DexEncodedMethod) -> h
     void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod) -> i
     1:1:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):66:66 -> j
-com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo -> com.android.tools.r8.ir.optimize.info.o:
+com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo -> com.android.tools.r8.ir.optimize.info.q:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList parametersUsages -> a
     1:1:void <clinit>():27:27 -> <clinit>
@@ -33496,7 +33666,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.ir.optimize.info.o$a:
+com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage -> com.android.tools.r8.ir.optimize.info.q$a:
     java.util.List callsReceiver -> c
     boolean hasFieldRead -> e
     boolean isAssignedToField -> f
@@ -33506,7 +33676,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.ir.optimize.info.o$b:
+com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsageBuilder -> com.android.tools.r8.ir.optimize.info.r:
     boolean $assertionsDisabled -> i
     java.util.Set ifZeroTestTypes -> c
     java.util.List callsOnReceiver -> d
@@ -33537,7 +33707,7 @@
     31:32:boolean note(com.android.tools.r8.ir.code.Return):186:187 -> a
     31:32:boolean note(com.android.tools.r8.ir.code.Instruction):126 -> a
     33:33:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage build():132:132 -> a
-com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo -> com.android.tools.r8.ir.optimize.info.p:
+com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo -> com.android.tools.r8.ir.optimize.info.s:
     boolean returnsConstantNumber -> i
     boolean returnsConstantString -> k
     boolean initializerEnablingJavaAssertions -> u
@@ -33566,120 +33736,206 @@
     boolean neverReturnsNull -> g
     boolean cannotBeKept -> a
     1:1:void <clinit>():23:23 -> <clinit>
-    1:1:void <init>():81:81 -> <init>
-    2:56:void <init>():25:79 -> <init>
-    57:57:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):85:85 -> <init>
-    58:139:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):25:106 -> <init>
-    1:2:long getReturnedConstantNumber():247:248 -> A
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility():242:242 -> B
-    1:1:java.util.Set getInitializedClassesOnNormalExit():166:166 -> C
-    1:1:boolean isInitializerEnablingJavaAssertions():259:259 -> D
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo():171:171 -> E
-    1:1:java.util.BitSet getNonNullParamOrThrow():181:181 -> F
-    1:1:void markAsPropagated():425:425 -> G
-    1:1:void markCannotBeKept():142:142 -> H
-    1:1:void markClassInitializerMayBePostponed():151:151 -> I
-    1:2:void markForceInline():392:393 -> J
-    1:1:void markMayNotHaveSideEffects():336:336 -> K
-    1:2:void markNeverInline():406:407 -> L
-    1:1:void markNeverReturnsNormally():348:348 -> M
-    1:1:void markNeverReturnsNull():344:344 -> N
-    1:1:void markReturnValueOnlyDependsOnArguments():340:340 -> O
-    1:1:void markUseIdentifierNameString():412:412 -> P
-    1:1:void setInitializerEnablingJavaAssertions():322:322 -> Q
-    1:2:void unsetForceInline():399:400 -> R
-    1:6:void fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):111:116 -> a
-    7:7:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage getParameterUsages(int):176:176 -> a
-    8:8:void setParameterUsages(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo):298:298 -> a
-    9:9:void setNonNullParamOnNormalExits(java.util.BitSet):306:306 -> a
-    10:10:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):314:314 -> a
-    11:11:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):318:318 -> a
-    12:12:void markInitializesClassesOnNormalExit(java.util.Set):326:326 -> a
-    13:17:void markReturnsConstantNumber(long):352:356 -> a
-    18:22:void markReturnsConstantString(com.android.tools.r8.graph.DexString):360:364 -> a
-    23:29:void markReturnsObjectOfType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):368:374 -> a
-    30:36:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):378:384 -> a
-    37:42:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):381:386 -> a
-    43:43:void markCheckNullReceiverBeforeAnySideEffect(boolean):416:416 -> a
-    44:45:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo mutableCopy():435:436 -> a
-    1:1:java.util.BitSet getNonNullParamOnNormalExits():186:186 -> b
-    2:2:void setNonNullParamOrThrow(java.util.BitSet):302:302 -> b
-    3:5:void markReturnsArgument(int):330:332 -> b
-    6:6:void markTriggerClassInitBeforeAnySideEffect(boolean):420:420 -> b
-    1:1:boolean cannotBeKept():137:137 -> c
-    2:2:void setReachabilitySensitive(boolean):310:310 -> c
-    1:1:boolean checksNullReceiverBeforeAnySideEffect():279:279 -> d
-    1:1:boolean returnValueHasBeenPropagated():430:430 -> e
-    1:1:boolean classInitializerMayBePostponed():147:147 -> f
-    1:2:int getReturnedArgument():210:211 -> g
-    1:2:com.android.tools.r8.graph.DexString getReturnedConstantString():253:254 -> h
-    1:1:boolean returnValueOnlyDependsOnArguments():294:294 -> i
-    1:1:boolean neverInline():274:274 -> j
-    1:1:boolean neverReturnsNormally():221:221 -> k
-    1:2:boolean returnsConstant():226:227 -> l
-    1:1:boolean returnsConstantString():237:237 -> m
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicReturnType():156:156 -> n
-    1:1:boolean useIdentifierNameString():264:264 -> o
-    1:1:boolean triggersClassInitBeforeAnySideEffect():284:284 -> p
-    1:1:boolean returnsConstantNumber():232:232 -> q
-    1:1:boolean returnsArgument():205:205 -> r
+    1:1:void <init>():83:83 -> <init>
+    2:58:void <init>():25:81 -> <init>
+    59:59:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):87:87 -> <init>
+    60:143:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):25:108 -> <init>
+    1:2:long getReturnedConstantNumber():249:250 -> A
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility():244:244 -> B
+    1:1:java.util.Set getInitializedClassesOnNormalExit():168:168 -> C
+    1:1:boolean isInitializerEnablingJavaAssertions():261:261 -> D
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo():173:173 -> E
+    1:1:java.util.BitSet getNonNullParamOrThrow():183:183 -> F
+    1:41:void adjustOptimizationInfoAfterRemovingThisParameter():444:484 -> G
+    1:1:void markAsPropagated():427:427 -> H
+    1:1:void markCannotBeKept():144:144 -> I
+    1:1:void markClassInitializerMayBePostponed():153:153 -> J
+    1:2:void markForceInline():394:395 -> K
+    1:1:void markMayNotHaveSideEffects():338:338 -> L
+    1:2:void markNeverInline():408:409 -> M
+    1:1:void markNeverReturnsNormally():350:350 -> N
+    1:1:void markNeverReturnsNull():346:346 -> O
+    1:1:void markReturnValueOnlyDependsOnArguments():342:342 -> P
+    1:1:void markUseIdentifierNameString():414:414 -> Q
+    1:1:void setInitializerEnablingJavaAssertions():324:324 -> R
+    1:2:void unsetForceInline():401:402 -> S
+    1:6:void fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):113:118 -> a
+    7:7:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage getParameterUsages(int):178:178 -> a
+    8:8:void setParameterUsages(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo):300:300 -> a
+    9:9:void setNonNullParamOnNormalExits(java.util.BitSet):308:308 -> a
+    10:10:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):316:316 -> a
+    11:11:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):320:320 -> a
+    12:12:void markInitializesClassesOnNormalExit(java.util.Set):328:328 -> a
+    13:17:void markReturnsConstantNumber(long):354:358 -> a
+    18:22:void markReturnsConstantString(com.android.tools.r8.graph.DexString):362:366 -> a
+    23:29:void markReturnsObjectOfType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):370:376 -> a
+    30:36:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):380:386 -> a
+    37:42:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):383:388 -> a
+    43:43:void markCheckNullReceiverBeforeAnySideEffect(boolean):418:418 -> a
+    44:45:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo mutableCopy():437:438 -> a
+    1:1:java.util.BitSet getNonNullParamOnNormalExits():188:188 -> b
+    2:2:void setNonNullParamOrThrow(java.util.BitSet):304:304 -> b
+    3:5:void markReturnsArgument(int):332:334 -> b
+    6:6:void markTriggerClassInitBeforeAnySideEffect(boolean):422:422 -> b
+    1:1:boolean cannotBeKept():139:139 -> c
+    2:2:void setReachabilitySensitive(boolean):312:312 -> c
+    1:1:boolean checksNullReceiverBeforeAnySideEffect():281:281 -> d
+    1:1:boolean returnValueHasBeenPropagated():432:432 -> e
+    1:1:boolean classInitializerMayBePostponed():149:149 -> f
+    1:2:int getReturnedArgument():212:213 -> g
+    1:2:com.android.tools.r8.graph.DexString getReturnedConstantString():255:256 -> h
+    1:1:boolean returnValueOnlyDependsOnArguments():296:296 -> i
+    1:1:boolean neverInline():276:276 -> j
+    1:1:boolean neverReturnsNormally():223:223 -> k
+    1:2:boolean returnsConstant():228:229 -> l
+    1:1:boolean returnsConstantString():239:239 -> m
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicReturnType():158:158 -> n
+    1:1:boolean useIdentifierNameString():266:266 -> o
+    1:1:boolean triggersClassInitBeforeAnySideEffect():286:286 -> p
+    1:1:boolean returnsConstantNumber():234:234 -> q
+    1:1:boolean returnsArgument():207:207 -> r
     boolean isUpdatableMethodOptimizationInfo() -> s
-    1:1:boolean neverReturnsNull():216:216 -> t
-    1:1:boolean isReachabilitySensitive():200:200 -> u
+    1:1:boolean neverReturnsNull():218:218 -> t
+    1:1:boolean isReachabilitySensitive():202:202 -> u
     com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo asUpdatableMethodOptimizationInfo() -> v
-    1:1:boolean forceInline():269:269 -> w
+    1:1:boolean forceInline():271:271 -> w
     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.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.ir.optimize.q0.a:
+    1:1:boolean mayHaveSideEffects():291:291 -> y
+    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType():163:163 -> z
+com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.ir.optimize.q0.a:
+    boolean $assertionsDisabled -> a
+    1:1:void <clinit>():14:14 -> <clinit>
+    1:4:void collectAllMonitorEnterValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):20:23 -> a
+    5:5:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32:32 -> a
+    6:6:boolean com.android.tools.r8.ir.code.Value.hasAliasedValue():243:243 -> a
+    6:6:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32 -> a
+    7:11:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32:36 -> a
+    12:12:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):34:34 -> a
+com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.ir.optimize.q0.b:
     com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter INSTANCE -> a
-    1:1:void <clinit>():13:13 -> <clinit>
-    1:1:void <init>():16:16 -> <init>
-    void reportInstructionBudgetIsExceeded() -> a
-    void reportPotentialExplosionInExceptionalControlFlowResolutionBlocks(int,int) -> a
+    1:1:void <clinit>():15:15 -> <clinit>
+    1:1:void <init>():18:18 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter getInstance():21:21 -> A
+    void reportBlacklisted() -> a
+    void reportIncorrectArity(int,int) -> a
+    void reportInvalidInliningReason(com.android.tools.r8.ir.optimize.Inliner$Reason,java.util.Set) -> 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 reportCallerNotSameClass() -> b
+    void reportPotentialExplosionInExceptionalControlFlowResolutionBlocks(int,int) -> b
+    void reportCallerNotSameNest() -> c
+    void reportWillExceedInstructionBudget(int,int) -> c
+    void reportCallerNotSamePackage() -> d
+    void reportWillExceedMonitorEnterValuesBudget(int,int) -> d
+    void reportCallerNotSubtype() -> e
+    void reportClasspathMethod() -> f
+    void reportInaccessible() -> g
+    void reportInlineeDoesNotHaveCode() -> h
+    void reportInlineeNotInliningCandidate() -> i
+    void reportInlineeNotProcessed() -> j
+    void reportInlineeNotSimple() -> k
+    void reportInlineeRefersToClassesNotInMainDex() -> l
+    void reportInliningAcrossFeatureSplit() -> m
+    void reportInstructionBudgetIsExceeded() -> n
+    void reportInvalidDoubleInliningCandidate() -> o
+    void reportLibraryMethod() -> p
+    void reportMarkedAsNeverInline() -> q
+    void reportMustTriggerClassInitialization() -> r
+    void reportNoInliningIntoConstructorsWhenGeneratingClassFiles() -> s
+    void reportPinned() -> t
+    void reportProcessedConcurrently() -> u
+    void reportReceiverDefinitelyNull() -> v
+    void reportReceiverMaybeNull() -> w
+    void reportRecursiveMethod() -> x
+    void reportUnknownTarget() -> y
+    boolean verifyReasonHasBeenReported() -> z
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.ir.optimize.q0.c:
+    1:1:void <init>():18:18 -> <init>
+    void reportBlacklisted() -> a
+    void reportIncorrectArity(int,int) -> a
+    void reportInvalidInliningReason(com.android.tools.r8.ir.optimize.Inliner$Reason,java.util.Set) -> 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:
+    1:5:com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter createFor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):22:26 -> a
+    6:20:void handleInvokeWithUnknownTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):31:45 -> a
+    void reportCallerNotSameClass() -> b
+    void reportPotentialExplosionInExceptionalControlFlowResolutionBlocks(int,int) -> b
+    void reportCallerNotSameNest() -> c
+    void reportWillExceedInstructionBudget(int,int) -> c
+    void reportCallerNotSamePackage() -> d
+    void reportWillExceedMonitorEnterValuesBudget(int,int) -> d
+    void reportCallerNotSubtype() -> e
+    void reportClasspathMethod() -> f
+    void reportInaccessible() -> g
+    void reportInlineeDoesNotHaveCode() -> h
+    void reportInlineeNotInliningCandidate() -> i
+    void reportInlineeNotProcessed() -> j
+    void reportInlineeNotSimple() -> k
+    void reportInlineeRefersToClassesNotInMainDex() -> l
+    void reportInliningAcrossFeatureSplit() -> m
+    void reportInstructionBudgetIsExceeded() -> n
+    void reportInvalidDoubleInliningCandidate() -> o
+    void reportLibraryMethod() -> p
+    void reportMarkedAsNeverInline() -> q
+    void reportMustTriggerClassInitialization() -> r
+    void reportNoInliningIntoConstructorsWhenGeneratingClassFiles() -> s
+    void reportPinned() -> t
+    void reportProcessedConcurrently() -> u
+    void reportReceiverDefinitelyNull() -> v
+    void reportReceiverMaybeNull() -> w
+    void reportRecursiveMethod() -> x
+    void reportUnknownTarget() -> y
+    boolean verifyReasonHasBeenReported() -> z
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.ir.optimize.q0.d:
     com.android.tools.r8.graph.DexEncodedMethod callee -> a
     boolean $assertionsDisabled -> e
     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
+    1:1:void <clinit>():16:16 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):25:25 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):22:28 -> <init>
+    1:11:void print(java.lang.String):32:42 -> a
+    12:12:void printWithExceededThreshold(java.lang.String,java.lang.String,int,int):47:47 -> a
+    13:13:void reportBlacklisted():52:52 -> a
+    14:14:void reportIncorrectArity(int,int):92:92 -> a
+    15:19:void reportInvalidInliningReason(com.android.tools.r8.ir.optimize.Inliner$Reason,java.util.Set):146:150 -> a
+    20:20:void reportInvalidInliningReason(com.android.tools.r8.ir.optimize.Inliner$Reason,java.util.Set):146:146 -> a
+    21:25:void reportUnsafeConstructorInliningDueToFinalFieldAssignment(com.android.tools.r8.ir.code.InstancePut):219:223 -> a
+    26:26:void reportUnsafeConstructorInliningDueToFinalFieldAssignment(com.android.tools.r8.ir.code.InstancePut):219:219 -> a
+    27:29:void reportUnsafeConstructorInliningDueToIndirectConstructorCall(com.android.tools.r8.ir.code.InvokeDirect):229:231 -> a
+    30:30:void reportUnsafeConstructorInliningDueToIndirectConstructorCall(com.android.tools.r8.ir.code.InvokeDirect):229:229 -> a
+    31:31:void reportUnsafeConstructorInliningDueToUninitializedObjectUse(com.android.tools.r8.ir.code.Instruction):237:237 -> a
+    1:1:void reportCallerNotSameClass():57:57 -> b
+    2:2:void reportPotentialExplosionInExceptionalControlFlowResolutionBlocks(int,int):184:184 -> b
+    1:1:void reportCallerNotSameNest():62:62 -> c
+    2:2:void reportWillExceedInstructionBudget(int,int):242:242 -> c
+    1:1:void reportCallerNotSamePackage():67:67 -> d
+    2:2:void reportWillExceedMonitorEnterValuesBudget(int,int):252:252 -> d
+    1:1:void reportCallerNotSubtype():74:74 -> e
+    1:1:void reportClasspathMethod():82:82 -> f
+    1:1:void reportInaccessible():87:87 -> g
+    1:1:void reportInlineeDoesNotHaveCode():102:102 -> h
+    1:1:void reportInlineeNotInliningCandidate():107:107 -> i
+    1:1:void reportInlineeNotProcessed():112:112 -> j
+    1:1:void reportInlineeNotSimple():117:117 -> k
+    1:1:void reportInlineeRefersToClassesNotInMainDex():124:124 -> l
+    1:1:void reportInliningAcrossFeatureSplit():131:131 -> m
+    1:1:void reportInstructionBudgetIsExceeded():136:136 -> n
+    1:1:void reportInvalidDoubleInliningCandidate():141:141 -> o
+    1:1:void reportLibraryMethod():156:156 -> p
+    1:1:void reportMarkedAsNeverInline():161:161 -> q
+    1:1:void reportMustTriggerClassInitialization():166:166 -> r
+    1:1:void reportNoInliningIntoConstructorsWhenGeneratingClassFiles():173:173 -> s
+    1:1:void reportPinned():178:178 -> t
+    1:1:void reportProcessedConcurrently():193:193 -> u
+    1:1:void reportReceiverDefinitelyNull():199:199 -> v
+    1:1:void reportReceiverMaybeNull():204:204 -> w
+    1:1:void reportRecursiveMethod():209:209 -> x
+    1:1:void reportUnknownTarget():214:214 -> y
+    1:1:boolean verifyReasonHasBeenReported():261:261 -> z
 com.android.tools.r8.ir.optimize.lambda.CaptureSignature -> com.android.tools.r8.ir.optimize.r0.a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList SINGLE_LIST -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList EMPTY_LIST -> a
@@ -33845,49 +34101,55 @@
     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):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):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.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):0:0 -> a
+    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$300(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):86 -> a
+    2:2:com.android.tools.r8.ir.optimize.lambda.LambdaGroup getLambdaGroup(com.android.tools.r8.graph.DexType):146:146 -> a
+    2:2:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):408 -> a
+    2:2:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$300(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):86 -> a
+    3:3:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):409:409 -> a
+    3:3:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$300(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):86 -> a
+    4:4:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> a
+    5:5:void invalidateLambda(com.android.tools.r8.graph.DexType):138:138 -> a
+    6:6:void queueForProcessing(com.android.tools.r8.graph.DexEncodedMethod):150:150 -> a
+    6:6:void access$200(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod):86 -> a
+    7:40:void collectGroupCandidates(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):159:192 -> a
+    41:41:boolean lambda$collectGroupCandidates$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):160:160 -> a
+    42:42:int lambda$collectGroupCandidates$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):167:167 -> a
+    43:44:void processMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203:204 -> a
+    45:54:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):215:224 -> a
+    55:75:java.util.Map finalizeLambdaGroups():313:333 -> a
+    55:75:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):228 -> a
+    76:109:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):231:264 -> a
+    110:124:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):263:277 -> a
+    125:125:void lambda$applyLambdaClassMapping$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):232:232 -> a
+    126:126:com.android.tools.r8.ir.optimize.lambda.CodeProcessor lambda$applyLambdaClassMapping$7(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):242:242 -> a
+    127:127:void lambda$applyLambdaClassMapping$8(com.android.tools.r8.graph.DexEncodedMethod):258:258 -> a
+    128:128:boolean lambda$applyLambdaClassMapping$10(com.android.tools.r8.ir.optimize.lambda.LambdaGroup):266:266 -> a
+    129:131:boolean lambda$applyLambdaClassMapping$9(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):268:270 -> a
+    132:136:void analyzeReferencesInProgramClasses(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):282:286 -> a
+    137:156:void analyzeLambdaClassesStructure(java.util.concurrent.ExecutorService):290:309 -> a
+    157:157:void lambda$analyzeLambdaClassesStructure$13(java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):295:295 -> a
+    158:163:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):297:302 -> a
+    164:169:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):300:305 -> a
+    170:170:void invalidateLambda(com.android.tools.r8.graph.DexType):138:138 -> a
+    170:170:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):305 -> a
+    171:177:void removeTrivialLambdaGroups():339:345 -> a
+    178:188:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):353:363 -> a
+    189:202:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):362:375 -> a
+    203:207:java.lang.Object lambda$rewriteLambdaReferences$16(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):365:369 -> a
+    208:214:java.lang.Object lambda$rewriteLambdaReferences$16(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):365:371 -> a
+    215:216:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):379:380 -> a
+    215:216:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
+    217:218:void com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor.accept(com.android.tools.r8.graph.DexTypeList):108:109 -> a
+    217:218:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):380 -> a
+    217:218:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
+    219:241:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):381:403 -> a
+    219:241:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
+    242:242:void com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor.accept(com.android.tools.r8.graph.DexTypeList):108:108 -> a
+    242:242:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):380 -> a
+    242:242:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$100(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> b
-    2:2:void invalidateLambda(com.android.tools.r8.graph.DexType):138:138 -> b
+    2:2:boolean isMergeableLambda(com.android.tools.r8.graph.DexType):142:142 -> b
     3:5:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):163:165 -> b
     6:6:boolean com.android.tools.r8.kotlin.KotlinSyntheticClass.isLambda():48:48 -> b
     6:6:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):165 -> b
@@ -33898,10 +34160,8 @@
     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
+    2:2:void lambda$new$0(com.android.tools.r8.graph.DexType):133:133 -> c
     1:1:java.util.Map access$500(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> d
-    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
@@ -34314,13 +34574,13 @@
     9:9:boolean isValidInvoke(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):92:92 -> a
     10:12:boolean isValidVirtualCall(com.android.tools.r8.ir.code.InvokeMethod):109:111 -> a
     13:20:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):116:123 -> a
-    21:21:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    21:21:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     21:21:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):122 -> a
     22:27:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):122:127 -> a
     28:30:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):132:134 -> a
     31:35:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):212:216 -> a
     31:35:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):134 -> a
-    36:36:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    36:36:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     36:36:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):216 -> a
     36:36:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):134 -> a
     37:46:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):217:226 -> a
@@ -34362,11 +34622,11 @@
     113:113:com.android.tools.r8.graph.DexField mapSingletonInstanceField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexField):275:275 -> a
     113:113:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):192 -> a
     114:117:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):194:197 -> a
-    118:118:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    118:118:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     118:118:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):196 -> a
     119:125:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):196:202 -> a
     126:129:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):234:237 -> a
-    130:130:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    130:130:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     130:130:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):236 -> a
     1:5:boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):70:74 -> b
     6:15:boolean isValidInitializerCall(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):96:105 -> b
@@ -34833,7 +35093,7 @@
     367:372:void fixupStaticizedFieldReadUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):454:459 -> a
     373:390:void fixupStaticizedFieldReadUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):458:475 -> a
     391:400:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):479:488 -> a
-    401:401:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):959:959 -> a
+    401:401:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     401:401:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):488 -> a
     402:409:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):489:496 -> a
     410:410:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> a
@@ -34855,7 +35115,7 @@
     428:428:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):677:677 -> a
     1:1:void removeReferencesToThis(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):304:304 -> b
     1:21:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):310:330 -> c
-    22:22:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> c
+    22:22:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> c
     22:22:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):502 -> c
     22:22:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
     23:36:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):503:516 -> c
@@ -35003,7 +35263,7 @@
     209:225:void logHistogramOfChains(java.util.List,boolean):548:564 -> a
     226:226:void logHistogramOfChains(java.util.List,boolean):559:559 -> a
     227:228:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):575:576 -> a
-    229:229:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    229:229:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     229:229:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):576 -> a
     230:266:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):577:613 -> a
     267:272:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):611:616 -> a
@@ -35014,25 +35274,25 @@
     317:317:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     317:317:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):622 -> a
     318:318:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):622:622 -> a
-    319:319:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    319:319:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     319:319:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):576 -> a
     320:346:boolean isToStringOfInterest(java.util.Set,com.android.tools.r8.ir.code.Instruction):628:654 -> a
     320:346:boolean lambda$applyConcatenationResults$1(java.util.Set,com.android.tools.r8.ir.code.Instruction):578 -> a
     347:353:void removeTrivialBuilders():728:734 -> a
-    354:354:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    354:354:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     354:354:void removeTrivialBuilders():734 -> a
     355:367:void removeTrivialBuilders():735:747 -> a
-    368:368:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    368:368:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     368:368:void removeTrivialBuilders():747 -> a
     369:398:void removeTrivialBuilders():748:777 -> a
-    399:399:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    399:399:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     399:399:void removeTrivialBuilders():777 -> a
     400:409:void removeTrivialBuilders():778:787 -> a
-    410:410:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    410:410:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     410:410:void removeTrivialBuilders():777 -> a
-    411:411:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    411:411:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     411:411:void removeTrivialBuilders():747 -> a
-    412:412:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> a
+    412:412:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     412:412:void removeTrivialBuilders():734 -> a
     1:1:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$200(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191:191 -> b
     2:40:java.lang.Number extractConstantNumber(com.android.tools.r8.ir.code.Value):469:507 -> b
@@ -35063,64 +35323,78 @@
     37:37:void lambda$logResult$0(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping,java.lang.Integer):86:86 -> a
     38:39:void lambda$logResult$2(java.lang.Integer,java.lang.Integer):100:101 -> a
     40:40:void lambda$logResult$2(java.lang.Integer,java.lang.Integer):100:100 -> a
-    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():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):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():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
-    249:249:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):336 -> a
-    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):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
-    388:396:void logHistogramOfNames(com.android.tools.r8.ir.code.DexItemBasedConstString):483:491 -> a
+    41:44:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):133:136 -> a
+    45:45:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
+    45:45:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):137 -> a
+    46:95:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):138:187 -> a
+    96:101:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):185:190 -> a
+    102:118:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):189:205 -> a
+    119:183:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):203:267 -> a
+    184:184:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    184:184:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):268 -> a
+    185:192:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):270:277 -> a
+    193:193:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    193:193:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):278 -> a
+    194:202:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):280:288 -> a
+    203:203:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    203:203:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):289 -> a
+    204:209:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):292:297 -> a
+    210:210:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    210:210:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):297 -> a
+    211:211:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):297:297 -> a
+    212:215:java.lang.Integer lambda$computeTrivialOperationsOnConstString$4(com.android.tools.r8.graph.DexString):218:221 -> a
+    216:216:java.lang.Integer lambda$computeTrivialOperationsOnConstString$10(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):235:235 -> a
+    217:217:java.lang.Integer lambda$computeTrivialOperationsOnConstString$13(com.android.tools.r8.graph.DexString,java.lang.Integer):241:241 -> a
+    218:221:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):304:307 -> a
+    222:222:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
+    222:222:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):309 -> a
+    223:264:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):310:351 -> a
+    265:265:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    265:265:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):354 -> a
+    266:323:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):359:416 -> a
+    324:375:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):397:448 -> a
+    376:380:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):446:450 -> a
+    381:387:void logHistogramOfNames(com.android.tools.r8.graph.DexString):480:486 -> a
+    381:387:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):451 -> a
+    388:389:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):453:454 -> a
+    390:398:void logHistogramOfNames(com.android.tools.r8.ir.code.DexItemBasedConstString):501:509 -> a
+    390:398:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):456 -> a
+    399:400:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):461:462 -> a
+    401:401:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    401:401:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):462 -> a
+    402:405:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):462:465 -> a
+    406:411:void logDeferredNameComputation(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):491:496 -> a
     1:2:void lambda$logResult$1(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping,java.lang.Integer):93:94 -> b
     3:3:void lambda$logResult$1(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping,java.lang.Integer):93:93 -> b
     4:5:void lambda$logResult$3(java.lang.Integer,java.lang.Integer):108:109 -> b
     6:6:void lambda$logResult$3(java.lang.Integer,java.lang.Integer):108:108 -> b
-    7:7:java.lang.Integer lambda$computeTrivialOperationsOnConstString$5(com.android.tools.r8.graph.DexString):207:207 -> b
-    8:8:java.lang.Integer lambda$computeTrivialOperationsOnConstString$11(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):219:219 -> b
-    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():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
+    7:7:java.lang.Integer lambda$computeTrivialOperationsOnConstString$5(com.android.tools.r8.graph.DexString):225:225 -> b
+    8:8:java.lang.Integer lambda$computeTrivialOperationsOnConstString$11(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):237:237 -> b
+    9:9:java.lang.Integer lambda$computeTrivialOperationsOnConstString$15(com.android.tools.r8.graph.DexString,java.lang.Integer):245:245 -> b
+    10:15:void logNameComputation(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):470:475 -> b
+    16:16:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):517:517 -> b
+    17:17:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> b
+    17:17:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):518 -> b
+    18:38:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):519:539 -> b
+    39:82:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):537:580 -> b
     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
-    2:2:java.lang.Integer lambda$computeTrivialOperationsOnConstString$12(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):221:221 -> c
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$14(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):225:225 -> d
-    2:8:void logHistogramOfNames(com.android.tools.r8.graph.DexString):462:468 -> d
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$16(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):229:229 -> e
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$17(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):231:231 -> f
-    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$18(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):233:233 -> g
-    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
+    83:83:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):580 -> b
+    84:84:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):580:580 -> b
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$6(com.android.tools.r8.graph.DexString):227:227 -> c
+    2:2:java.lang.Integer lambda$computeTrivialOperationsOnConstString$12(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):239:239 -> c
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$14(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):243:243 -> d
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$16(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):247:247 -> e
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$17(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):249:249 -> f
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$18(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):251:251 -> g
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$7(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):229:229 -> h
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):231:231 -> i
+    1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$9(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):233:233 -> j
 com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.ir.optimize.string.a:
     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>
-    1:1:com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration getInstance():575:575 -> a
-    1:21:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):584:604 -> isLegitimateEscapeRoute
+    1:1:void <clinit>():587:587 -> <clinit>
+    1:1:void <init>():590:590 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration getInstance():593:593 -> a
+    1:21:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):602:622 -> isLegitimateEscapeRoute
 com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator -> com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator:
     int firstParallelMoveTemporary -> n
     boolean $assertionsDisabled -> p
@@ -35155,7 +35429,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():1478:1478 -> a
+    126:126:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
     126:126:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):491 -> a
     126:126:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
     127:129:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):491:493 -> a
@@ -35438,16 +35712,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():330:330 -> a
+    1489:1489:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     1489:1489:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2651 -> a
     1489:1489:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2479 -> a
     1490:1496:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2479:2485 -> a
     1497:1548:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2518:2569 -> a
     1549:1555:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2566:2572 -> a
-    1556:1556:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    1556:1556:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     1556:1556:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2572 -> a
     1557:1564:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2572:2579 -> a
-    1565:1565:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    1565:1565:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     1565:1565:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2651 -> a
     1565:1565:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2579 -> a
     1566:1603:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2579:2616 -> a
@@ -35459,7 +35733,7 @@
     1648:1652:boolean argumentsAreAlreadyLinked(com.android.tools.r8.ir.code.Invoke):2869:2873 -> a
     1648:1652:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2764 -> a
     1653:1686:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2765:2798 -> a
-    1687:1688:boolean com.android.tools.r8.ir.code.Value.hasRegisterConstraint():746:747 -> a
+    1687:1688:boolean com.android.tools.r8.ir.code.Value.hasRegisterConstraint():750:751 -> a
     1687:1688:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2800 -> a
     1689:1689:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2801:2801 -> a
     1690:1691:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):2749:2750 -> a
@@ -35503,14 +35777,14 @@
     98:103:void computeLiveRanges():2490:2495 -> b
     98:103:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> b
     98:103:void allocateRegisters():213 -> b
-    104:104:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():1156:1156 -> b
+    104:104:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():1158:1158 -> b
     104:104:void computeLiveRanges():2495 -> b
     104:104:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> b
     104:104:void allocateRegisters():213 -> b
     105:105:void computeLiveRanges():2495:2495 -> b
     105:105:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> b
     105:105:void allocateRegisters():213 -> b
-    106:106:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():1165:1165 -> b
+    106:106:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():1167:1167 -> b
     106:106:void computeLiveRanges():2495 -> b
     106:106:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> b
     106:106:void allocateRegisters():213 -> b
@@ -35520,10 +35794,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():879:879 -> b
+    131:131:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> b
     131:131:void allocateRegisters():227 -> b
     132:136:void allocateRegisters():228:232 -> b
-    137:137:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():879:879 -> b
+    137:137:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> b
     137:137:void allocateRegisters():227 -> b
     138:138:void allocateRegisters():236:236 -> b
     139:144:void clearState():531:536 -> b
@@ -35536,7 +35810,7 @@
     177:181:void increaseCapacity(int,boolean):2962:2966 -> b
     1:3:int registersUsed():588:590 -> c
     4:4:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1499:1499 -> c
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():1171:1171 -> c
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():1173:1173 -> c
     5:5:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1499 -> c
     6:26:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1502:1522 -> c
     27:39:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1535:1547 -> c
@@ -35544,10 +35818,10 @@
     42:42:boolean registersAreFree(int,boolean):3110:3110 -> c
     1:1:int highestUsedRegister():583:583 -> d
     2:2:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438:1438 -> d
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1204:1204 -> d
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1206:1206 -> d
     3:3:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
     4:4:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438:1438 -> d
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1378:1378 -> d
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1380:1380 -> d
     5:5:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
     6:24:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1459 -> d
     25:25:boolean com.android.tools.r8.ir.code.NumberConversion.isLongToIntConversion():52:52 -> d
@@ -35555,12 +35829,12 @@
     26:26:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469:1469 -> d
     27:27:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438:1438 -> d
     27:27:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
-    28:28:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1204:1204 -> d
+    28:28:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1206:1206 -> d
     28:28:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
     28:28:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
     29:29:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438:1438 -> d
     29:29:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
-    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1378:1378 -> d
+    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1380:1380 -> d
     30:30:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
     30:30:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
     31:49:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1459 -> d
@@ -35966,7 +36240,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():1478:1478 -> a
+    62:62:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> 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
@@ -35987,7 +36261,7 @@
     91:95:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):316:320 -> a
     96:104:void removeArgumentRestores(java.util.Set):332:340 -> a
     105:129:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):347:371 -> a
-    130:130:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():1140:1140 -> a
+    130:130:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():1142:1142 -> a
     130:130:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):371 -> a
     131:136:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):371:376 -> a
     137:141:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):375:379 -> a
@@ -36019,53 +36293,70 @@
 com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider -> com.android.tools.r8.w.e.a$a:
     com.android.tools.r8.ir.conversion.SourceCode get(com.android.tools.r8.ir.code.Position) -> a
 com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider -> com.android.tools.r8.w.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
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):41:41 -> <init>
+    1:1:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexString):46:46 -> a
     2:2:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType):30:30 -> a
-    2:2:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.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
+    2:2:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexString):46 -> a
+    3:9:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexString):49:55 -> a
 com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.w.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
+    1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):293:294 -> <init>
+    1:9:com.android.tools.r8.graph.CfCode generateCfCode():299:307 -> a
+    10:10:com.android.tools.r8.graph.CfCode generateCfCode():305:305 -> a
+    11:23:com.android.tools.r8.graph.CfCode generateCfCode():302:314 -> a
 com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterThrowRuntimeExceptionCfCodeProvider -> com.android.tools.r8.w.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
+    1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):324:325 -> <init>
+    1:11:com.android.tools.r8.graph.CfCode generateCfCode():330:340 -> a
+    12:12:com.android.tools.r8.graph.CfCode generateCfCode():338:338 -> a
+    13:22:com.android.tools.r8.graph.CfCode generateCfCode():335:344 -> a
 com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.w.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
+    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):83:87 -> <init>
+    1:14:com.android.tools.r8.graph.CfCode generateCfCode():92:105 -> a
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):66:66 -> a
+    15:15:com.android.tools.r8.graph.CfCode generateCfCode():108 -> a
+    16:16:com.android.tools.r8.graph.CfCode generateCfCode():108:108 -> a
+    17:17:com.android.tools.r8.graph.CfCode generateCfCode():105:105 -> a
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):66:66 -> a
+    18:18:com.android.tools.r8.graph.CfCode generateCfCode():110 -> a
+    19:30:com.android.tools.r8.graph.CfCode generateCfCode():110:121 -> a
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):66:66 -> a
+    31:31:com.android.tools.r8.graph.CfCode generateCfCode():122 -> a
+    32:43:com.android.tools.r8.graph.CfCode generateCfCode():125:136 -> a
+    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):66:66 -> a
+    44:44:com.android.tools.r8.graph.CfCode generateCfCode():140 -> a
+    45:45:com.android.tools.r8.graph.CfCode generateCfCode():139:139 -> a
+    46:58:com.android.tools.r8.graph.CfCode generateCfCode():136:148 -> a
 com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.w.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
+    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):167:171 -> <init>
+    1:17:com.android.tools.r8.graph.CfCode generateCfCode():176:192 -> a
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):66:66 -> a
+    18:18:com.android.tools.r8.graph.CfCode generateCfCode():195 -> a
+    19:19:com.android.tools.r8.graph.CfCode generateCfCode():195:195 -> a
+    20:40:com.android.tools.r8.graph.CfCode generateCfCode():192:212 -> a
+    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):66:66 -> a
+    41:41:com.android.tools.r8.graph.CfCode generateCfCode():216 -> a
+    42:42:com.android.tools.r8.graph.CfCode generateCfCode():215:215 -> a
+    43:43:com.android.tools.r8.graph.CfCode generateCfCode():212:212 -> a
+    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):66:66 -> a
+    44:44:com.android.tools.r8.graph.CfCode generateCfCode():218 -> a
+    45:50:com.android.tools.r8.graph.CfCode generateCfCode():220:225 -> a
 com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperConversionCfCodeProvider -> com.android.tools.r8.w.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
+    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):237:240 -> <init>
+    1:36:com.android.tools.r8.graph.CfCode generateCfCode():245:280 -> a
+    37:37:com.android.tools.r8.graph.CfCode generateCfCode():278:278 -> a
+    38:47:com.android.tools.r8.graph.CfCode generateCfCode():275:284 -> a
 com.android.tools.r8.ir.synthetic.EmulateInterfaceSyntheticCfCodeProvider -> com.android.tools.r8.w.e.h:
     java.util.List extraDispatchCases -> f
     com.android.tools.r8.graph.DexType interfaceType -> c
@@ -41098,7 +41389,7 @@
     99:103:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):195 -> a
     104:104:void lambda$writeClass$0(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):196:196 -> a
     105:108:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):200:203 -> a
-    109:109:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    109:109:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     109:109:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):204 -> a
     110:114:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):203:207 -> a
     115:122:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):222:229 -> a
@@ -41130,7 +41421,7 @@
     256:256:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):416:416 -> a
     257:257:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):414:414 -> a
     1:9:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):108:116 -> b
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> b
+    10:10:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> b
     10:10:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):116 -> b
     11:11:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):119:119 -> b
     12:23:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):117:128 -> b
@@ -41190,12 +41481,17 @@
     java.lang.Object _value -> b
     java.lang.Object lock -> c
     1:5:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0,java.lang.Object):55:59 -> <init>
-    1:14:java.lang.Object getValue():63:76 -> a
-    15:20:java.lang.Object getValue():69:74 -> a
-    21:21:java.lang.Object getValue():69:69 -> a
     1:1:boolean isInitialized():82:82 -> toString
     1:1:java.lang.String toString():84 -> toString
-    2:2:java.lang.String toString():84:84 -> toString
+    2:15:java.lang.Object getValue():63:76 -> toString
+    2:15:java.lang.String toString():84 -> toString
+    16:16:java.lang.Object getValue():69:69 -> toString
+    16:16:java.lang.String toString():84 -> toString
+    17:17:java.lang.String toString():84:84 -> toString
+    18:18:java.lang.Object getValue():74:74 -> toString
+    18:18:java.lang.String toString():84 -> toString
+    19:19:java.lang.Object getValue():69:69 -> toString
+    19:19:java.lang.String toString():84 -> toString
 com.android.tools.r8.jetbrains.kotlin.TypeCastException -> com.android.tools.r8.z.a.j:
     1:1:void <init>(java.lang.String):11:11 -> <init>
 com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE -> com.android.tools.r8.z.a.k:
@@ -45731,17 +46027,19 @@
     1:1:void <clinit>():765:765 -> <clinit>
     1:7:void <init>(int):783:789 -> <init>
     8:8:void <init>(int):785:785 -> <init>
-    1:1:int size():872:872 -> a
-    2:10:void flushFullBuffer(int):898:906 -> a
-    1:1:void flushLastBuffer():914:914 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> b
-    2:3:byte[] copyArray(byte[],int):835:836 -> b
-    2:3:void flushLastBuffer():916 -> b
-    2:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> b
-    4:18:void flushLastBuffer():917:931 -> b
-    4:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> b
-    19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():828:828 -> b
+    1:9:void flushFullBuffer(int):898:906 -> a
+    10:10:void flushLastBuffer():914:914 -> a
+    10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> a
+    11:12:byte[] copyArray(byte[],int):835:836 -> a
+    11:12:void flushLastBuffer():916 -> a
+    11:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> a
+    13:27:void flushLastBuffer():917:931 -> a
+    13:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():827 -> a
+    28:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString toByteString():828:828 -> a
     1:1:java.lang.String toString():888:888 -> toString
+    2:2:int size():872:872 -> toString
+    2:2:java.lang.String toString():888 -> toString
+    3:3:java.lang.String toString():888:888 -> toString
     1:4:void write(int):794:797 -> write
     5:19:void write(byte[],int,int):802:816 -> write
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream -> com.android.tools.r8.z.b.a.b.b.l:
@@ -47119,7 +47417,7 @@
     1:5:boolean equals(java.lang.Object):67:71 -> equals
     1:1:int hashCode():76:76 -> hashCode
     1:1:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.kotlin.Kotlin -> com.android.tools.r8.A.c:
+com.android.tools.r8.kotlin.Kotlin -> com.android.tools.r8.A.d:
     java.lang.String KOTLIN -> f
     com.android.tools.r8.kotlin.Kotlin$Functional functional -> b
     com.android.tools.r8.kotlin.Kotlin$Metadata metadata -> d
@@ -47151,7 +47449,7 @@
     3:3:int getArity(com.android.tools.r8.graph.DexType):85 -> a
     4:6:int getArity(com.android.tools.r8.graph.DexType):85:87 -> a
     1:1:boolean isFunctionInterface(com.android.tools.r8.graph.DexType):81:81 -> b
-com.android.tools.r8.kotlin.Kotlin$Intrinsics -> com.android.tools.r8.A.c$a:
+com.android.tools.r8.kotlin.Kotlin$Intrinsics -> com.android.tools.r8.A.c:
     com.android.tools.r8.graph.DexType type -> a
     com.android.tools.r8.graph.DexMethod throwNpe -> d
     com.android.tools.r8.graph.DexMethod checkParameterIsNotNull -> c
@@ -47161,7 +47459,7 @@
     5:8:void <init>(com.android.tools.r8.kotlin.Kotlin):106:109 -> <init>
     9:13:void <init>(com.android.tools.r8.kotlin.Kotlin):108:112 -> <init>
     14:14:void <init>(com.android.tools.r8.kotlin.Kotlin):111:111 -> <init>
-com.android.tools.r8.kotlin.Kotlin$Metadata -> com.android.tools.r8.A.c$b:
+com.android.tools.r8.kotlin.Kotlin$Metadata -> com.android.tools.r8.A.d$a:
     com.android.tools.r8.graph.DexString kind -> b
     com.android.tools.r8.graph.DexString metadataVersion -> c
     com.android.tools.r8.graph.DexString bytecodeVersion -> d
@@ -47173,17 +47471,17 @@
     com.android.tools.r8.graph.DexString extraInt -> i
     com.android.tools.r8.graph.DexType kotlinMetadataType -> a
     1:10:void <init>(com.android.tools.r8.kotlin.Kotlin):91:100 -> <init>
-com.android.tools.r8.kotlin.KotlinClass -> com.android.tools.r8.A.d:
+com.android.tools.r8.kotlin.KotlinClass -> com.android.tools.r8.A.e:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,com.android.tools.r8.graph.DexClass):20:20 -> <init>
     1:3:com.android.tools.r8.kotlin.KotlinClass fromKotlinClassMetadata(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexClass):14:16 -> a
-com.android.tools.r8.kotlin.KotlinClassFacade -> com.android.tools.r8.A.e:
+com.android.tools.r8.kotlin.KotlinClassFacade -> com.android.tools.r8.A.f:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade):19:19 -> <init>
     1:4:com.android.tools.r8.kotlin.KotlinClassFacade fromKotlinClassMetadata(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata):12:15 -> a
-com.android.tools.r8.kotlin.KotlinClassMetadataReader -> com.android.tools.r8.A.g:
+com.android.tools.r8.kotlin.KotlinClassMetadataReader -> com.android.tools.r8.A.h:
     1:15:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.DiagnosticsHandler):27:41 -> a
     16:16:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.DiagnosticsHandler):39:39 -> a
     17:19:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.DiagnosticsHandler):35:37 -> a
@@ -47229,24 +47527,24 @@
     5:5:java.lang.String getUnboxedString(com.android.tools.r8.graph.DexValue,java.lang.String):122:122 -> b
     1:8:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):108:115 -> c
     9:9:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):109:109 -> c
-com.android.tools.r8.kotlin.KotlinClassMetadataReader$MetadataError -> com.android.tools.r8.A.f:
+com.android.tools.r8.kotlin.KotlinClassMetadataReader$MetadataError -> com.android.tools.r8.A.g:
     1:1:void <init>(java.lang.String):129:129 -> <init>
-com.android.tools.r8.kotlin.KotlinClassPart -> com.android.tools.r8.A.h:
+com.android.tools.r8.kotlin.KotlinClassPart -> com.android.tools.r8.A.i:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart):19:19 -> <init>
     1:4:com.android.tools.r8.kotlin.KotlinClassPart fromKotlinClassMetdata(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata):12:15 -> a
-com.android.tools.r8.kotlin.KotlinFile -> com.android.tools.r8.A.i:
+com.android.tools.r8.kotlin.KotlinFile -> com.android.tools.r8.A.j:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade):19:19 -> <init>
     1:4:com.android.tools.r8.kotlin.KotlinFile fromKotlinClassMetadata(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata):12:15 -> a
-com.android.tools.r8.kotlin.KotlinInfo -> com.android.tools.r8.A.j:
+com.android.tools.r8.kotlin.KotlinInfo -> com.android.tools.r8.A.k:
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata):17:17 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexClass):20:20 -> <init>
     com.android.tools.r8.kotlin.KotlinSyntheticClass asSyntheticClass() -> a
     boolean isSyntheticClass() -> b
-com.android.tools.r8.kotlin.KotlinSyntheticClass -> com.android.tools.r8.A.l:
+com.android.tools.r8.kotlin.KotlinSyntheticClass -> com.android.tools.r8.A.m:
     com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour flavour -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():10:10 -> <clinit>
@@ -47262,7 +47560,7 @@
     boolean isSyntheticClass() -> b
     1:1:boolean isJavaStyleLambda():56:56 -> c
     1:1:boolean isKotlinStyleLambda():52:52 -> d
-com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour -> com.android.tools.r8.A.k:
+com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour -> com.android.tools.r8.A.l:
     com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour Unclassified -> c
     com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour JavaStyleLambda -> b
     com.android.tools.r8.kotlin.KotlinSyntheticClass$Flavour KotlinStyleLambda -> a
@@ -47795,23 +48093,28 @@
     105:105:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):120 -> a
     106:223:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):201:318 -> a
     224:227:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):209:212 -> a
-    228:243:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):337:352 -> a
-    228:243:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    244:244:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):351:351 -> a
-    244:244:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    245:270:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):217:242 -> a
-    271:271: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
-    271:271:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):242 -> a
-    272:352:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):245:325 -> a
-    353:359:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):324:330 -> a
-    360:360: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
-    360:360:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):329 -> a
-    361:364:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):328:331 -> a
-    365:365:com.android.tools.r8.ir.code.Value lambda$decoupleIdentifierNameStringForInvokeInstruction$2(com.android.tools.r8.ir.code.Value[],com.android.tools.r8.ir.code.Value,long):326:326 -> a
-    366:372:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):361:367 -> a
-    373:373:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    373:373:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):367 -> a
-    374:395:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):369:390 -> a
+    228:229:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):337:338 -> a
+    228:229:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
+    230:231:boolean com.android.tools.r8.naming.IdentifierNameStringUtils.isClassNameComparison(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):147:148 -> a
+    230:231:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):338 -> a
+    230:231:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
+    232:245:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):339:352 -> a
+    232:245:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
+    246:246:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):351:351 -> a
+    246:246:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
+    247:272:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):217:242 -> a
+    273:273:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> a
+    273:273:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):242 -> a
+    274:354:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):245:325 -> a
+    355:361:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):324:330 -> a
+    362:362:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):66:66 -> a
+    362:362:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):329 -> a
+    363:366:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):328:331 -> a
+    367:367:com.android.tools.r8.ir.code.Value lambda$decoupleIdentifierNameStringForInvokeInstruction$2(com.android.tools.r8.ir.code.Value[],com.android.tools.r8.ir.code.Value,long):326:326 -> a
+    368:374:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):361:367 -> a
+    375:375:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    375:375:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):367 -> a
+    376:397:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):369:390 -> a
 com.android.tools.r8.naming.IdentifierNameStringUtils -> com.android.tools.r8.naming.o:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():35:35 -> <clinit>
@@ -47865,10 +48168,10 @@
     3:5:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):406:408 -> a
     6:8:void reserveNamesInInterfaces(java.util.Collection):396:398 -> a
     6:8:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):409 -> a
-    9:10:void com.android.tools.r8.naming.MethodNameMinifier$State.allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):105:106 -> a
+    9:10:void com.android.tools.r8.naming.MethodNameMinifier$State.allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):106:107 -> a
     9:10:void reserveNamesInInterfaces(java.util.Collection):398 -> a
     9:10:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):409 -> a
-    11:11:void com.android.tools.r8.naming.MethodNameMinifier$State.allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):105:105 -> a
+    11:11:void com.android.tools.r8.naming.MethodNameMinifier$State.allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):106:106 -> a
     11:11:void reserveNamesInInterfaces(java.util.Collection):398 -> a
     11:11:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):409 -> a
     12:14:void reserveNamesInInterfaces(java.util.Collection):399:401 -> a
@@ -47878,7 +48181,7 @@
     20:25:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):413:418 -> a
     26:32:void computeReservationFrontiersForAllImplementingClasses():583:589 -> a
     26:32:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):419 -> a
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.MethodNameMinifier$State.getFrontier(com.android.tools.r8.graph.DexType):110:110 -> a
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.MethodNameMinifier$State.getFrontier(com.android.tools.r8.graph.DexType):111:111 -> a
     33:33:void computeReservationFrontiersForAllImplementingClasses():589 -> a
     33:33:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):419 -> a
     34:35:void computeReservationFrontiersForAllImplementingClasses():590:591 -> a
@@ -47910,7 +48213,7 @@
     243:243:java.lang.Object com.android.tools.r8.utils.DisjointSets.unionWithMakeSet(java.lang.Object,java.lang.Object):134:134 -> a
     243:243:void lambda$assignNamesToInterfaceMethods$1(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):468 -> a
     244:247:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):559:562 -> a
-    248:248:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):101:101 -> a
+    248:248:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):102:102 -> a
     248:248:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):562 -> a
     249:252:com.android.tools.r8.graph.DexString assignNewName(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):564:567 -> a
     253:253:boolean lambda$assignNewName$2(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):566:566 -> a
@@ -47931,7 +48234,7 @@
     29:30:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):305:306 -> a
     31:31:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State):314:314 -> a
     32:32:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):316:316 -> a
-    33:33:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):93:93 -> a
+    33:33:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):94:94 -> a
     33:33:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.naming.MethodNameMinifier$State,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):317 -> a
     34:34:void forEachState(java.util.function.BiConsumer):322:322 -> a
     35:35:java.lang.Object lambda$forEachState$5(java.util.function.BiConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):324:324 -> a
@@ -47943,10 +48246,10 @@
     2:2:java.util.Set lambda$appendMethodGroupState$1(com.android.tools.r8.graph.DexMethod):252:252 -> b
     3:3:void reserveName(com.android.tools.r8.graph.DexString):288:288 -> b
     4:7:void lambda$reserveName$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):290:293 -> b
-    8:8:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):93:93 -> b
+    8:8:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):94:94 -> b
     8:8:void lambda$reserveName$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):293 -> b
     9:10:void lambda$reserveName$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):295:296 -> b
-    11:11:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):93:93 -> b
+    11:11:void com.android.tools.r8.naming.MethodNameMinifier$State.putRenaming(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):94:94 -> b
     11:11:void lambda$reserveName$2(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):296 -> b
     1:1:java.util.Map access$400(com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState):240:240 -> c
     1:1:int compareTo(java.lang.Object):240:240 -> compareTo
@@ -47965,14 +48268,14 @@
     3:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):163:163 -> a
     3:3:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexMethod):116 -> a
     4:4:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexMethod):118:118 -> a
-    5:5:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.MethodNameMinifier$State.getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):114:114 -> a
+    5:5:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.MethodNameMinifier$State.getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):115:115 -> a
     5:5:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexMethod):118 -> a
     6:21:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexMethod):126:141 -> a
     22:29:java.lang.Boolean lambda$getReservedName$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):129:136 -> a
     30:30:void addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):171:171 -> a
     31:31:void lambda$addRenaming$5(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):173:173 -> a
     32:32:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):175:175 -> a
-    33:33:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):101:101 -> a
+    33:33:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):102:102 -> a
     33:33:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):175 -> a
     34:35:void com.android.tools.r8.naming.MethodNamingState.addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):70:71 -> a
     34:35:void lambda$addRenaming$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):176 -> a
@@ -47980,12 +48283,12 @@
     37:37:java.lang.Object lambda$forAll$6(java.util.function.Consumer,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):184:184 -> a
     38:46:java.lang.Object forAny(java.util.function.Function):190:198 -> a
     1:1:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):149:149 -> b
-    2:2:com.android.tools.r8.naming.MethodReservationState com.android.tools.r8.naming.MethodNameMinifier$State.getReservationState(com.android.tools.r8.graph.DexType):97:97 -> b
+    2:2:com.android.tools.r8.naming.MethodReservationState com.android.tools.r8.naming.MethodNameMinifier$State.getReservationState(com.android.tools.r8.graph.DexType):98:98 -> b
     2:2:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):149 -> b
     3:3:void lambda$reserveName$1(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):150:150 -> b
     4:15:boolean isAvailable(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):156:167 -> b
     16:17:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):159:160 -> b
-    18:18:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):101:101 -> b
+    18:18:com.android.tools.r8.naming.MethodNamingState com.android.tools.r8.naming.MethodNameMinifier$State.getNamingState(com.android.tools.r8.graph.DexType):102:102 -> b
     18:18:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):160 -> b
     19:20:java.lang.Boolean lambda$isAvailable$3(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceReservationState):161:162 -> b
     21:28:java.lang.Object forChildren(java.util.function.Function):219:226 -> b
@@ -48076,61 +48379,62 @@
     com.android.tools.r8.com.google.common.collect.BiMap reservationStates -> e
     java.util.Map namingStates -> f
     java.util.Map frontiers -> g
-    1:1:void <clinit>():86:86 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):134:134 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):121:140 -> <init>
-    1:1:java.util.Map access$000(com.android.tools.r8.naming.MethodNameMinifier):86:86 -> a
-    2:2:com.android.tools.r8.naming.MethodNamingState access$200(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType):86:86 -> a
-    3:3:com.android.tools.r8.naming.MethodReservationState access$400(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):86:86 -> a
-    4:9:java.util.function.Function getKeyTransform():144:149 -> a
-    10:10:java.lang.Object lambda$getKeyTransform$0(com.android.tools.r8.graph.DexMethod):146:146 -> a
-    11:11:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):173:173 -> a
-    12:14:void reserveNamesInClasses():247:249 -> a
-    12:14:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):174 -> a
-    15:15:void reserveNamesInClasses():247:247 -> a
-    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:50:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):195:212 -> a
+    1:1:void <clinit>():87:87 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):135:135 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.MemberNamingStrategy):122:141 -> <init>
+    1:1:java.util.Map access$000(com.android.tools.r8.naming.MethodNameMinifier):87:87 -> a
+    2:2:com.android.tools.r8.naming.MethodNamingState access$200(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType):87:87 -> a
+    3:3:com.android.tools.r8.naming.MethodReservationState access$400(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):87:87 -> a
+    4:9:java.util.function.Function getKeyTransform():145:150 -> a
+    10:10:java.lang.Object lambda$getKeyTransform$0(com.android.tools.r8.graph.DexMethod):147:147 -> a
+    11:11:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):174:174 -> a
+    12:14:void reserveNamesInClasses():248:250 -> a
+    12:14:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):175 -> a
+    15:15:void reserveNamesInClasses():248:248 -> a
+    15:15:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):175 -> a
+    16:32:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,java.util.Set,com.android.tools.r8.utils.Timing):176:192 -> a
+    33:50:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):196:213 -> a
     51:51:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    51:51:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):212 -> a
-    52:61:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):213:222 -> a
-    62:62:com.android.tools.r8.naming.MethodNamingState lambda$assignNamesToClassesMethods$2(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):200:200 -> a
-    63:77:void assignNameToMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState):228:242 -> a
+    51:51:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):213 -> a
+    52:61:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):214:223 -> a
+    62:62:com.android.tools.r8.naming.MethodNamingState lambda$assignNamesToClassesMethods$2(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):201:201 -> a
+    63:77:void assignNameToMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState):229:243 -> a
     78:79:void com.android.tools.r8.naming.MethodNamingState.addRenaming(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):70:71 -> a
-    78:79:void assignNameToMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState):242 -> a
-    80:89:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):274:283 -> a
+    78:79:void assignNameToMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState):243 -> a
+    80:89:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):275:284 -> a
     90:90:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    90:90:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):283 -> a
-    91:91:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):285:285 -> a
-    92:92:java.lang.Iterable shuffleMethods(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):322:322 -> a
-    92:92: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 -> a
-    93:96: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
-    97:97:com.android.tools.r8.naming.MethodReservationState lambda$allocateReservationStateAndReserve$3(com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):281:281 -> a
-    98:104:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):297:303 -> a
-    105:105:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    105:105:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):303 -> a
-    106:114:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):305:313 -> a
-    1:1:com.android.tools.r8.com.google.common.collect.BiMap access$100(com.android.tools.r8.naming.MethodNameMinifier):86:86 -> b
-    2:2:java.lang.Object lambda$getKeyTransform$1(com.android.tools.r8.graph.DexMethod):149:149 -> b
-    3:11:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):255:263 -> b
+    90:90:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):284 -> a
+    91:91:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):286:286 -> a
+    92:92:java.lang.Iterable shuffleMethods(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):331:331 -> a
+    92:92:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):286 -> a
+    93:102:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):286:295 -> a
+    103:103:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):293:293 -> a
+    104:104:com.android.tools.r8.naming.MethodReservationState lambda$allocateReservationStateAndReserve$3(com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):282:282 -> a
+    105:111:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):306:312 -> a
+    112:112:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    112:112:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):312 -> a
+    113:121:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):314:322 -> a
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap access$100(com.android.tools.r8.naming.MethodNameMinifier):87:87 -> b
+    2:2:java.lang.Object lambda$getKeyTransform$1(com.android.tools.r8.graph.DexMethod):150:150 -> b
+    3:11:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):256:264 -> b
     12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> b
-    12:12:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):263 -> b
-    13:16:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):264:267 -> b
-    17:17:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):265:265 -> b
-    1:1:com.android.tools.r8.naming.MethodReservationState access$300(com.android.tools.r8.naming.MethodNameMinifier):86:86 -> c
-    1:1:java.util.Map access$500(com.android.tools.r8.naming.MethodNameMinifier):86:86 -> d
-    1:1:com.android.tools.r8.naming.MemberNamingStrategy access$600(com.android.tools.r8.naming.MethodNameMinifier):86:86 -> e
+    12:12:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):264 -> b
+    13:16:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):265:268 -> b
+    17:17:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):266:266 -> b
+    1:1:com.android.tools.r8.naming.MethodReservationState access$300(com.android.tools.r8.naming.MethodNameMinifier):87:87 -> c
+    1:1:java.util.Map access$500(com.android.tools.r8.naming.MethodNameMinifier):87:87 -> d
+    1:1:com.android.tools.r8.naming.MemberNamingStrategy access$600(com.android.tools.r8.naming.MethodNameMinifier):87:87 -> e
 com.android.tools.r8.naming.MethodNameMinifier$1 -> com.android.tools.r8.naming.v:
 com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming -> com.android.tools.r8.naming.w$a:
     java.util.Map renaming -> a
     java.util.Map callSiteRenaming -> b
-    1:1:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.naming.MethodNameMinifier$1):153:153 -> <init>
-    2:4:void <init>(java.util.Map,java.util.Map):159:161 -> <init>
-    1:1:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming empty():165:165 -> a
+    1:1:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.naming.MethodNameMinifier$1):154:154 -> <init>
+    2:4:void <init>(java.util.Map,java.util.Map):160:162 -> <init>
+    1:1:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming empty():166:166 -> a
 com.android.tools.r8.naming.MethodNameMinifier$State -> com.android.tools.r8.naming.x:
     com.android.tools.r8.naming.MethodNameMinifier this$0 -> a
-    1:1:void <init>(com.android.tools.r8.naming.MethodNameMinifier):90:90 -> <init>
-    1:1:com.android.tools.r8.naming.MethodReservationState getReservationState(com.android.tools.r8.graph.DexType):97:97 -> a
+    1:1:void <init>(com.android.tools.r8.naming.MethodNameMinifier):91:91 -> <init>
+    1:1:com.android.tools.r8.naming.MethodReservationState getReservationState(com.android.tools.r8.graph.DexType):98:98 -> a
 com.android.tools.r8.naming.MethodNamingState -> com.android.tools.r8.naming.A:
     com.android.tools.r8.naming.MethodNamingState parentNamingState -> d
     boolean $assertionsDisabled -> f
@@ -48403,7 +48707,7 @@
     30:31:java.lang.String lookupPackageName(java.lang.String):125 -> a
     32:32:java.lang.String lookupPackageName(java.lang.String):126:126 -> a
     33:33:void forAllRenamedTypes(java.util.function.Consumer):142:142 -> a
-    34:34:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():309:309 -> a
+    34:34:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     34:34:void forAllRenamedTypes(java.util.function.Consumer):142 -> a
     35:37:void forAllRenamedTypes(java.util.function.Consumer):143:145 -> a
     38:51:java.util.Map getRenamedItems(java.lang.Class,java.util.function.Predicate,java.util.function.Function):152:165 -> a
@@ -49056,7 +49360,7 @@
     60:60:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):139:139 -> a
     61:61:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):169:169 -> a
     61:61:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):145 -> a
-    62:62:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():330:330 -> a
+    62:62:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     62:62:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):169 -> a
     62:62:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):145 -> a
     63:66:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):169:172 -> a
@@ -51145,13 +51449,13 @@
     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:3:com.android.tools.r8.shaking.AppInfoWithLiveness addEnumValueInfoMaps(java.util.Map):1204:1206 -> addEnumValueInfoMaps
+    1:3:com.android.tools.r8.shaking.AppInfoWithLiveness addSwitchMaps(java.util.Map):1197:1199 -> addSwitchMaps
     1:12:boolean assertNoItemRemoved(java.util.Collection,java.util.Collection):638:649 -> assertNoItemRemoved
     1:33:java.util.Collection computeReachableInterfaces(java.util.Set):555:587 -> computeReachableInterfaces
     1:3:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):617:619 -> filter
     4:4:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):617:617 -> filter
-    1:40:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1006:1045 -> findSingleTargetFromSubtypes
+    1:40:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1033:1072 -> findSingleTargetFromSubtypes
     1:2:java.util.Map getEnumValueInfoMapFor(com.android.tools.r8.graph.DexType):623:624 -> getEnumValueInfoMapFor
     1:1:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():634:634 -> getFieldAccessInfoCollection
     1:2:java.lang.Iterable getPinnedItems():824:825 -> getPinnedItems
@@ -51159,7 +51463,7 @@
     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:10:boolean interfacesMayHaveDefaultFor(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexMethod):1088:1097 -> interfacesMayHaveDefaultFor
     1:11:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):688:698 -> isFieldRead
     1:2:boolean isFieldWritten(com.android.tools.r8.graph.DexEncodedField):702:703 -> isFieldWritten
     1:12:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):707:718 -> isFieldWrittenByFieldPutInstruction
@@ -51167,6 +51471,7 @@
     1:6:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexType):655:660 -> isInstantiatedDirectly
     1:3:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):682:684 -> isInstantiatedDirectlyOrIndirectly
     1:15:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexType):664:678 -> isInstantiatedIndirectly
+    1:4:boolean isInvalidSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):902:905 -> isInvalidSingleVirtualTarget
     1:2:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):743:744 -> isLibraryOrClasspathField
     1:1:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):538:538 -> isLiveProgramClass
     1:2:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):542:543 -> isLiveProgramType
@@ -51174,26 +51479,30 @@
     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):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:2:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1105:1106 -> lookupSingleInterfaceTarget
+    3:24:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1114:1135 -> lookupSingleInterfaceTarget
+    25:57:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1134:1166 -> lookupSingleInterfaceTarget
+    58:58:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> lookupSingleInterfaceTarget
+    58:58:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1165 -> lookupSingleInterfaceTarget
+    59:85:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1167:1193 -> lookupSingleInterfaceTarget
     1:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):862:877 -> lookupSingleTarget
     17:17:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):875:875 -> lookupSingleTarget
     18:18:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):873:873 -> lookupSingleTarget
     19:19:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):871:871 -> lookupSingleTarget
     20:20:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):869:869 -> lookupSingleTarget
-    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):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:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):910:911 -> lookupSingleVirtualTarget
+    3:21:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):919:937 -> lookupSingleVirtualTarget
+    22:77:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):936:991 -> lookupSingleVirtualTarget
+    78:84:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):987:993 -> lookupSingleVirtualTarget
+    85:94:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):986:995 -> lookupSingleVirtualTarget
+    95:95:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):973:973 -> lookupSingleVirtualTarget
     1:2:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):738:739 -> mayPropagateValueFor
-    1:8:com.android.tools.r8.graph.DexEncodedMethod nestAccessLookup(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):973:980 -> nestAccessLookup
+    1:8:com.android.tools.r8.graph.DexEncodedMethod nestAccessLookup(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1000:1007 -> nestAccessLookup
     1:2:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):836:837 -> prunedCopyFrom
     1:6:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteItems(java.util.Set,java.util.function.Function):749:754 -> rewriteItems
     1:10:java.util.SortedMap rewriteKeysConservativelyWhileMergingValues(java.util.Map,java.util.function.Function):760:769 -> rewriteKeysConservativelyWhileMergingValues
     1:2:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLense(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):842:843 -> rewrittenWithLense
+    1:9:com.android.tools.r8.graph.DexEncodedMethod validateSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):885:893 -> validateSingleVirtualTarget
     1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):851:852 -> wasPruned
     1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():786:786 -> withLiveness
     1:19:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):593:611 -> withoutStaticFieldsWrites
@@ -51271,577 +51580,501 @@
     1:3:void checkItem(com.android.tools.r8.graph.DexDefinition,java.util.List):37:39 -> checkItem
     1:6:java.util.List run():26:31 -> run
 com.android.tools.r8.shaking.Enqueuer -> com.android.tools.r8.shaking.Enqueuer:
-    1:1:void <clinit>():117:117 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):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 <clinit>():103:103 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):293:293 -> <init>
+    2:185:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):131:314 -> <init>
     1:1:void com.android.tools.r8.graph.analysis.EnqueuerAnalysis.processNewlyLiveField(com.android.tools.r8.graph.DexEncodedField):0:0 -> a
-    1:1:void lambda$markInstanceFieldAsLive$21(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1709 -> a
+    1:1:void lambda$markInstanceFieldAsLive$21(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1713 -> a
     boolean lambda$markVirtualMethodAsReachable$25(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod) -> a
     void lambda$newSetWithoutReasonReporter$1(java.lang.Object,com.android.tools.r8.shaking.KeepReason) -> a
     2:2:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():248:248 -> a
-    2:2:void lambda$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
+    2:2:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1579 -> a
+    3:3:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1580:1580 -> a
     4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    4:4:void lambda$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
+    4:4:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1580 -> a
+    5:12:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1581:1588 -> a
+    13:13:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1585:1585 -> a
+    14:19:void lambda$getNonPinnedWrittenFields$0(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):374:379 -> a
     20:20:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):158:158 -> a
-    20:20:void lambda$getNonPinnedWrittenFields$0(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):398 -> a
-    21:27:void lambda$getNonPinnedWrittenFields$0(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):400:406 -> a
-    28:28:java.util.Set lambda$registerMethodWithTargetAndContext$3(com.android.tools.r8.graph.DexMethod):530:530 -> a
-    29:29:boolean lambda$markTypeAsLive$8(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1198:1198 -> a
-    30:30:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$10(com.android.tools.r8.graph.DexType):1210:1210 -> a
-    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
+    20:20:void lambda$getNonPinnedWrittenFields$0(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):379 -> a
+    21:27:void lambda$getNonPinnedWrittenFields$0(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):381:387 -> a
+    28:28:java.util.Set lambda$registerMethodWithTargetAndContext$3(com.android.tools.r8.graph.DexMethod):511:511 -> a
+    29:29:boolean lambda$markTypeAsLive$8(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1180:1180 -> a
+    30:30:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$10(com.android.tools.r8.graph.DexType):1192:1192 -> a
+    31:31:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1428:1428 -> a
     32:32:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexProgramClass.asProgramClass():0:0 -> a
-    32:32:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.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):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
+    32:32:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1428 -> a
+    33:33:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1656:1656 -> a
+    34:34:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$22(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1818:1818 -> a
+    35:35:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markInstanceFieldAsReachable$24(com.android.tools.r8.graph.DexProgramClass):1839:1839 -> a
+    36:36:java.util.Set lambda$markSuperMethodAsReachable$27(com.android.tools.r8.graph.DexEncodedMethod):2113:2113 -> a
+    37:37:void lambda$createAppInfo$28(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder,com.android.tools.r8.graph.DexAnnotation):2165:2165 -> a
+    38:38:boolean lambda$createAppInfo$29(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):2170:2170 -> a
+    39:39:java.util.Set lambda$trace$30(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):2268:2268 -> a
+    40:40:void lambda$trace$31(com.android.tools.r8.graph.DexReference,java.util.Map):2289:2289 -> a
+    41:41:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2294:2294 -> a
     42:42:boolean com.android.tools.r8.graph.DexType.isDexType():0:0 -> a
-    42:42:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2333 -> a
-    43:43:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2334:2334 -> a
+    42:42:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2294 -> a
+    43:43:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2295:2295 -> a
     44:44:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    44:44:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2334 -> a
-    45:45:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2335:2335 -> a
+    44:44:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2295 -> a
+    45:45:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2296:2296 -> a
     46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.asDexType():0:0 -> a
-    46:46:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):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):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):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
-    1:1:java.util.Map access$1100(com.android.tools.r8.shaking.Enqueuer):117:117 -> access$1100
-    1:1: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:117 -> access$1200
-    1:1:java.util.Map access$1300(com.android.tools.r8.shaking.Enqueuer):117:117 -> access$1300
-    1:1:void access$1400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):117:117 -> access$1400
-    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping access$1500(com.android.tools.r8.shaking.Enqueuer):117:117 -> access$1500
-    1:1:void access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):117:117 -> access$1600
-    1:1:com.android.tools.r8.graph.DexProgramClass access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):117:117 -> access$1700
-    1:1:java.util.Set access$1800(com.android.tools.r8.shaking.Enqueuer):117:117 -> access$1800
-    1:1:void access$1900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):117:117 -> access$1900
-    1:1:java.util.Set access$200(com.android.tools.r8.shaking.Enqueuer):117:117 -> access$200
-    1:1:void access$2000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,java.util.function.Function):117:117 -> access$2000
-    1:1:void access$2100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):117:117 -> access$2100
-    1:1:boolean access$2200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):117:117 -> access$2200
-    1:1:void access$2300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):117:117 -> access$2300
-    1:1:java.util.Set access$2400(com.android.tools.r8.shaking.Enqueuer):117:117 -> access$2400
-    1:1:void access$2500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):117:117 -> access$2500
-    1:1:java.util.Set access$2600(com.android.tools.r8.shaking.Enqueuer):117:117 -> access$2600
-    1:1:void access$2700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):117:117 -> access$2700
-    1:1:com.android.tools.r8.utils.InternalOptions access$2800(com.android.tools.r8.shaking.Enqueuer):117:117 -> access$2800
-    1:1:java.util.Set access$2900(com.android.tools.r8.shaking.Enqueuer):117:117 -> access$2900
-    1:1:java.util.Set access$300(com.android.tools.r8.shaking.Enqueuer):117:117 -> access$300
-    1:1:java.util.Set access$3000(com.android.tools.r8.shaking.Enqueuer):117:117 -> access$3000
-    1:1:java.util.Set access$3100(com.android.tools.r8.shaking.Enqueuer):117:117 -> access$3100
-    1:1:void access$3200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):117:117 -> access$3200
-    1:1:boolean access$3300(com.android.tools.r8.shaking.Enqueuer):117:117 -> access$3300
-    1:1:void access$3400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):117:117 -> access$3400
-    1:1:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl access$3500(com.android.tools.r8.shaking.Enqueuer):117:117 -> access$3500
-    1:1:java.util.Map access$400(com.android.tools.r8.shaking.Enqueuer):117:117 -> access$400
-    1:1:void access$4100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):117:117 -> access$4100
-    1:1:void access$4200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):117:117 -> access$4200
-    1:1:void access$4300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):117:117 -> access$4300
-    1:1:void access$4400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):117:117 -> access$4400
-    1:1:void access$4500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):117:117 -> access$4500
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphConsumer access$4600(com.android.tools.r8.shaking.Enqueuer):117:117 -> access$4600
-    1:1:boolean access$500(com.android.tools.r8.shaking.Enqueuer,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):117:117 -> access$500
-    1:1:com.android.tools.r8.shaking.EnqueuerWorklist access$600(com.android.tools.r8.shaking.Enqueuer):117:117 -> access$600
-    1:1:java.util.Map access$700(com.android.tools.r8.shaking.Enqueuer):117:117 -> access$700
-    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
+    46:46:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2295 -> a
+    47:47:void lambda$trace$33(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2316:2316 -> a
+    48:48:void lambda$markMethodAsLive$34(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):2480:2480 -> a
+    49:49:void lambda$markMethodAsLive$35(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2488:2488 -> a
+    1:1:com.android.tools.r8.shaking.GraphReporter access$100(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$100
+    1:1:java.util.Map access$1000(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$1000
+    1:1:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> access$1100
+    1:1:java.util.Map access$1200(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$1200
+    1:1:com.android.tools.r8.graph.DexMethod access$1300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):103:103 -> access$1300
+    1:1:java.util.Map access$1400(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$1400
+    1:1:void access$1500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):103:103 -> access$1500
+    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping access$1600(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$1600
+    1:1:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):103:103 -> access$1700
+    1:1:com.android.tools.r8.graph.DexProgramClass access$1800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):103:103 -> access$1800
+    1:1:java.util.Set access$1900(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$1900
+    1:1:com.android.tools.r8.graph.AppView access$200(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$200
+    1:1:void access$2000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103:103 -> access$2000
+    1:1:void access$2100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,java.util.function.Function):103:103 -> access$2100
+    1:1:void access$2200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> access$2200
+    1:1:boolean access$2300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):103:103 -> access$2300
+    1:1:void access$2400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):103:103 -> access$2400
+    1:1:java.util.Set access$2500(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$2500
+    1:1:void access$2600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103:103 -> access$2600
+    1:1:java.util.Set access$2700(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$2700
+    1:1:void access$2800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):103:103 -> access$2800
+    1:1:com.android.tools.r8.utils.InternalOptions access$2900(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$2900
+    1:1:java.util.Set access$300(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$300
+    1:1:java.util.Set access$3000(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$3000
+    1:1:java.util.Set access$3100(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$3100
+    1:1:java.util.Set access$3200(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$3200
+    1:1:void access$3300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):103:103 -> access$3300
+    1:1:boolean access$3400(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$3400
+    1:1:void access$3500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103:103 -> access$3500
+    1:1:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl access$3600(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$3600
+    1:1:java.util.Set access$400(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$400
+    1:1:void access$4100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):103:103 -> access$4100
+    1:1:void access$4200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> access$4200
+    1:1:void access$4300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> access$4300
+    1:1:void access$4400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):103:103 -> access$4400
+    1:1:java.util.Map access$500(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$500
+    1:1:boolean access$600(com.android.tools.r8.shaking.Enqueuer,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):103:103 -> access$600
+    1:1:com.android.tools.r8.shaking.EnqueuerWorklist access$700(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$700
+    1:1:java.util.Map access$800(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$800
+    1:1:void access$900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> access$900
     1:1:void com.android.tools.r8.graph.analysis.EnqueuerAnalysis.processNewlyLiveField(com.android.tools.r8.graph.DexEncodedField):0:0 -> b
-    1:1:void lambda$markStaticFieldAsLive$20(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):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):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):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):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):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):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):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
+    1:1:void lambda$markStaticFieldAsLive$20(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1695 -> b
+    2:2:void lambda$markTypeAsLive$9(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1181:1181 -> b
+    3:3:java.util.Set lambda$handleAnnotation$11(com.android.tools.r8.graph.DexType):1260:1260 -> b
+    4:4:void lambda$markMethodAsTargeted$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1402:1402 -> b
+    5:5:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$17(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1657:1657 -> b
+    6:6:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$23(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1820:1820 -> b
+    7:7:com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet lambda$markPossibleTargetsAsReachable$26(com.android.tools.r8.graph.DexProgramClass):1928:1928 -> b
+    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$4(com.android.tools.r8.graph.DexType):1088:1088 -> c
+    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markMethodAsTargeted$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1398:1398 -> c
+    3:3:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$18(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1664:1664 -> c
+    1:4:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):495:498 -> compatEnqueueHolderIfDependentNonStaticMember
+    1:16:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2163:2178 -> createAppInfo
+    17:57:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2177:2217 -> createAppInfo
+    58:60:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2216:2218 -> createAppInfo
+    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$5(com.android.tools.r8.graph.DexType):1107:1107 -> d
+    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$19(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1666:1666 -> d
+    3:3:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$36(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2494:2494 -> d
+    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$6(com.android.tools.r8.graph.DexType):1114:1114 -> e
+    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$37(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2498:2498 -> e
+    1:1:void enqueueDependentItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexDefinition,java.util.Set):1238:1238 -> enqueueDependentItem
+    1:11:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):467:477 -> enqueueFirstNonSerializableClassInitializer
     12:12:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> enqueueFirstNonSerializableClassInitializer
-    12:12:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):497 -> enqueueFirstNonSerializableClassInitializer
-    13:13:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):497:497 -> enqueueFirstNonSerializableClassInitializer
-    1:3:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):504:506 -> enqueueMarkMethodLiveAction
-    1:1:void enqueueRootItem(java.util.Map$Entry):426:426 -> enqueueRootItem
+    12:12:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):478 -> enqueueFirstNonSerializableClassInitializer
+    13:13:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):478:478 -> enqueueFirstNonSerializableClassInitializer
+    1:3:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):485:487 -> enqueueMarkMethodLiveAction
+    1:1:void enqueueRootItem(java.util.Map$Entry):407:407 -> enqueueRootItem
     2:2:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexReference):153:153 -> enqueueRootItem
-    2:2:void enqueueRootItem(java.util.Map$Entry):426 -> enqueueRootItem
-    3:3:void enqueueRootItem(java.util.Map$Entry):428:428 -> enqueueRootItem
-    4:4:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):436:436 -> enqueueRootItem
-    1:1:void enqueueRootItems(java.util.Map):422:422 -> enqueueRootItems
-    1:13:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1360:1372 -> ensureFromLibraryOrThrow
+    2:2:void enqueueRootItem(java.util.Map$Entry):407 -> enqueueRootItem
+    3:3:void enqueueRootItem(java.util.Map$Entry):409:409 -> enqueueRootItem
+    4:4:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):417:417 -> enqueueRootItem
+    1:1:void enqueueRootItems(java.util.Map):403:403 -> enqueueRootItems
+    1:13:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1343:1355 -> ensureFromLibraryOrThrow
     14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> ensureFromLibraryOrThrow
-    14:14:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1372 -> ensureFromLibraryOrThrow
-    15:26:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1373:1384 -> ensureFromLibraryOrThrow
-    1:4:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexClass):1208:1211 -> ensureMethodsContinueToWidenAccess
-    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: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):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
+    14:14:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1355 -> ensureFromLibraryOrThrow
+    15:26:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1356:1367 -> ensureFromLibraryOrThrow
+    1:4:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexClass):1190:1193 -> ensureMethodsContinueToWidenAccess
+    5:9:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1198:1202 -> ensureMethodsContinueToWidenAccess
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$registerMethodWithTargetAndContext$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):510:510 -> f
+    2:2:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$7(com.android.tools.r8.graph.DexType):1137:1137 -> f
+    1:38:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1974:2011 -> findAndMarkResolutionTarget
+    39:50:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2010:2021 -> findAndMarkResolutionTarget
+    1:5:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2048:2052 -> generatedEnumValuesMethod
+    6:11:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2051:2056 -> generatedEnumValuesMethod
+    1:1:com.android.tools.r8.shaking.GraphReporter getGraphReporter():322:322 -> getGraphReporter
+    1:1:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1045:1045 -> getInvokeSuperTarget
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> getInvokeSuperTarget
-    2:2:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1062 -> getInvokeSuperTarget
-    3:6:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1063:1066 -> getInvokeSuperTarget
+    2:2:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1045 -> getInvokeSuperTarget
+    3:6:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1046:1049 -> getInvokeSuperTarget
     7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> getInvokeSuperTarget
-    7:7:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):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):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
-    1:1:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):354:354 -> getProgramClassOrNull
+    7:7:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1049 -> getInvokeSuperTarget
+    8:13:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1050:1055 -> getInvokeSuperTarget
+    1:1:com.android.tools.r8.shaking.Enqueuer$Mode getMode():318:318 -> getMode
+    1:24:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):371:394 -> getNonPinnedWrittenFields
+    25:25:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):390:390 -> getNonPinnedWrittenFields
+    1:1:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):335:335 -> getProgramClassOrNull
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> getProgramClassOrNull
-    2:2:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):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):3411:3411 -> getSourceNode
-    1:3:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1270:1272 -> handleAnnotation
+    2:2:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):335 -> getProgramClassOrNull
+    3:11:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):337:345 -> getProgramClassOrNull
+    1:3:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1252:1254 -> handleAnnotation
     4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> handleAnnotation
-    4:4:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):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):2669:2676 -> handleJavaLangClassNewInstance
-    9:17:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2675:2683 -> handleJavaLangClassNewInstance
+    4:4:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1254 -> handleAnnotation
+    5:18:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1255:1268 -> handleAnnotation
+    1:29:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1310:1338 -> handleInvokeOfDirectTarget
+    1:23:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1272:1294 -> handleInvokeOfStaticTarget
+    1:8:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2634:2641 -> handleJavaLangClassNewInstance
+    9:17:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2640:2648 -> handleJavaLangClassNewInstance
     18:18:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> handleJavaLangClassNewInstance
-    18:18:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):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
+    18:18:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2652 -> handleJavaLangClassNewInstance
+    19:22:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2654:2657 -> handleJavaLangClassNewInstance
+    1:6:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2804:2809 -> handleJavaLangEnumValueOf
+    1:21:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2664:2684 -> handleJavaLangReflectConstructorNewInstance
+    22:48:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2683:2709 -> handleJavaLangReflectConstructorNewInstance
     49:49:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> handleJavaLangReflectConstructorNewInstance
-    49:49:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):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:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2711 -> handleJavaLangReflectConstructorNewInstance
+    50:94:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2713:2757 -> handleJavaLangReflectConstructorNewInstance
+    1:28:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2767:2794 -> handleJavaLangReflectProxyNewProxyInstance
+    1:7:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2528:2534 -> handleReflectiveBehavior
+    8:48:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2539:2579 -> handleReflectiveBehavior
     49:49:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> handleReflectiveBehavior
-    49:49:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2615 -> handleReflectiveBehavior
-    50:61:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2616:2627 -> handleReflectiveBehavior
+    49:49:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2580 -> handleReflectiveBehavior
+    50:61:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2581:2592 -> handleReflectiveBehavior
     62:62:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):158:158 -> handleReflectiveBehavior
-    62:62:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2627 -> handleReflectiveBehavior
-    63:81:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2636:2654 -> handleReflectiveBehavior
+    62:62:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2592 -> handleReflectiveBehavior
+    63:81:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2601:2619 -> handleReflectiveBehavior
     82:82:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):163:163 -> handleReflectiveBehavior
-    82:82:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):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
+    82:82:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2619 -> handleReflectiveBehavior
+    83:87:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2623:2627 -> handleReflectiveBehavior
+    88:88:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2625:2625 -> handleReflectiveBehavior
+    89:89:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2624:2624 -> handleReflectiveBehavior
+    1:13:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):2848:2860 -> handleServiceInstantiation
+    1:19:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2815:2833 -> handleServiceLoaderInvocation
+    20:36:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2826:2842 -> handleServiceLoaderInvocation
+    1:2:java.util.Set instanceFieldsWrittenOnlyInEnclosingInstanceInitializers():359:360 -> instanceFieldsWrittenOnlyInEnclosingInstanceInitializers
+    1:8:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):422:429 -> internalEnqueueRootItem
     9:9:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> internalEnqueueRootItem
-    9:9:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):449 -> internalEnqueueRootItem
-    10:13:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):450:453 -> internalEnqueueRootItem
-    14:18:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):451:455 -> internalEnqueueRootItem
+    9:9:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):430 -> internalEnqueueRootItem
+    10:13:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):431:434 -> internalEnqueueRootItem
+    14:18:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):432:436 -> internalEnqueueRootItem
     19:19:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):733:733 -> internalEnqueueRootItem
-    19:19:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):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):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):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):2242:2247 -> joinIdentifierNameStrings
-    1:6:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2545:2550 -> markClassAsInstantiatedWithCompatRule
+    19:19:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):436 -> internalEnqueueRootItem
+    20:35:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):437:452 -> internalEnqueueRootItem
+    36:36:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):450:450 -> internalEnqueueRootItem
+    1:1:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):1786:1786 -> isFieldLive
+    1:2:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):1790:1791 -> isFieldRead
+    1:5:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1795:1799 -> isFieldWrittenOutsideDefaultConstructor
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> isFieldWrittenOutsideDefaultConstructor
+    6:6:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1799 -> isFieldWrittenOutsideDefaultConstructor
+    7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> isFieldWrittenOutsideDefaultConstructor
+    7:7:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1800 -> isFieldWrittenOutsideDefaultConstructor
+    8:9:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1802:1803 -> isFieldWrittenOutsideDefaultConstructor
+    10:10:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> isFieldWrittenOutsideDefaultConstructor
+    10:10:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1800 -> isFieldWrittenOutsideDefaultConstructor
+    1:1:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1807:1807 -> isInstantiatedOrHasInstantiatedSubtype
+    1:1:boolean isProgramClass(com.android.tools.r8.graph.DexType):331:331 -> isProgramClass
+    1:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):2234:2239 -> joinIdentifierNameStrings
+    1:6:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2510:2515 -> markClassAsInstantiatedWithCompatRule
     7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> markClassAsInstantiatedWithCompatRule
-    7:7:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.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
+    7:7:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2516 -> markClassAsInstantiatedWithCompatRule
+    8:10:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2517:2519 -> markClassAsInstantiatedWithCompatRule
+    11:11:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2517:2517 -> markClassAsInstantiatedWithCompatRule
+    1:3:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2502:2504 -> markClassAsInstantiatedWithReason
     4:4:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> markClassAsInstantiatedWithReason
-    4:4:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):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
+    4:4:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2504 -> markClassAsInstantiatedWithReason
+    5:5:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2504:2504 -> markClassAsInstantiatedWithReason
+    1:13:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1755:1767 -> markDirectStaticOrConstructorMethodAsLive
     14:14:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markDirectStaticOrConstructorMethodAsLive
-    14:14:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):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
+    14:14:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1766 -> markDirectStaticOrConstructorMethodAsLive
+    1:7:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2060:2066 -> markEnumValuesAsReachable
+    1:8:void markFieldAsKept(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2399:2406 -> markFieldAsKept
+    1:2:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1656:1657 -> markFieldAsTargeted
+    1:6:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1699:1704 -> markInstanceFieldAsLive
     7:7:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markInstanceFieldAsLive
-    7:7:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):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
+    7:7:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1704 -> markInstanceFieldAsLive
+    8:15:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1706:1713 -> markInstanceFieldAsLive
+    1:3:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1812:1814 -> markInstanceFieldAsReachable
     4:4:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markInstanceFieldAsReachable
-    4:4:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):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
+    4:4:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1814 -> markInstanceFieldAsReachable
+    5:28:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1817:1840 -> markInstanceFieldAsReachable
+    1:2:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1718:1719 -> markInstantiated
     3:3:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markInstantiated
-    3:3:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.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):1720:1720 -> markLambdaInstantiated
+    3:3:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1719 -> markInstantiated
+    4:4:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1721:1721 -> markInstantiated
+    1:7:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):456:462 -> markInterfaceAsInstantiated
+    1:25:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1208:1232 -> markInterfaceTypeAsLiveViaInheritanceClause
+    1:1:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1725:1725 -> markLambdaInstantiated
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> markLambdaInstantiated
-    2:2:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):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
+    2:2:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1725 -> markLambdaInstantiated
+    3:24:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1727:1748 -> markLambdaInstantiated
+    1:22:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):1549:1570 -> markLibraryAndClasspathMethodOverridesAsLive
+    1:29:void markMethodAsKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2359:2387 -> markMethodAsKept
+    30:39:void markMethodAsKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2384:2393 -> markMethodAsKept
+    1:12:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2453:2464 -> markMethodAsLive
     13:13:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markMethodAsLive
-    13:13:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2500 -> markMethodAsLive
-    14:18:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2502:2506 -> markMethodAsLive
-    19:22:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2505:2508 -> markMethodAsLive
-    23:29:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2507:2513 -> markMethodAsLive
+    13:13:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2464 -> markMethodAsLive
+    14:18:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2466:2470 -> markMethodAsLive
+    19:22:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2469:2472 -> markMethodAsLive
+    23:29:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2471:2477 -> markMethodAsLive
     30:30:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> markMethodAsLive
-    30:30:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):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
+    30:30:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2477 -> markMethodAsLive
+    31:42:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2477:2488 -> markMethodAsLive
+    1:1:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2524:2524 -> markMethodAsLiveWithCompatRule
+    1:14:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1392:1405 -> markMethodAsTargeted
     15:15:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markMethodAsTargeted
-    15:15:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):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):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.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
+    15:15:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1405 -> markMethodAsTargeted
+    16:20:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1407:1411 -> markMethodAsTargeted
+    1:1:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1306:1306 -> markNonStaticDirectMethodAsReachable
+    1:5:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2492:2496 -> markParameterAndReturnTypesAsLive
+    1:1:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1917:1917 -> markPossibleTargetsAsReachable
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> markPossibleTargetsAsReachable
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1050 -> markPossibleTargetsAsReachable
+    2:2:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1917 -> markPossibleTargetsAsReachable
+    3:4:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1917:1918 -> markPossibleTargetsAsReachable
     5:5:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():248:248 -> markPossibleTargetsAsReachable
-    5:5:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):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
+    5:5:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1918 -> markPossibleTargetsAsReachable
+    6:52:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1918:1964 -> markPossibleTargetsAsReachable
+    53:59:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1961:1967 -> markPossibleTargetsAsReachable
+    60:63:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1944:1947 -> markPossibleTargetsAsReachable
+    64:64:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1944:1944 -> markPossibleTargetsAsReachable
+    1:16:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2029:2044 -> markPossiblyValidTarget
+    17:20:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2030:2033 -> markPossiblyValidTarget
+    21:29:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2032:2040 -> markPossiblyValidTarget
+    1:2:void markResolutionAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):1576:1577 -> markResolutionAsLive
+    1:19:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1662:1680 -> markStaticFieldAsLive
     20:20:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markStaticFieldAsLive
-    20:20:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1676 -> markStaticFieldAsLive
-    21:22:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1679:1680 -> markStaticFieldAsLive
+    20:20:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1680 -> markStaticFieldAsLive
+    21:22:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1683:1684 -> markStaticFieldAsLive
     23:23:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markStaticFieldAsLive
-    23:23:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):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
+    23:23:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1684 -> markStaticFieldAsLive
+    24:31:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1688:1695 -> markStaticFieldAsLive
+    1:15:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2077:2091 -> markSuperMethodAsReachable
+    16:35:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2090:2109 -> markSuperMethodAsReachable
     36:36:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markSuperMethodAsReachable
-    36:36:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):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
-    33:33:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1122:1122 -> markTypeAsLive
-    34:36:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1129:1131 -> markTypeAsLive
-    37:37:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1129:1129 -> markTypeAsLive
-    38:43:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1137:1142 -> markTypeAsLive
-    44:44:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markTypeAsLive
-    44:44:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1142 -> markTypeAsLive
-    45:103:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1145:1203 -> markTypeAsLive
+    36:36:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2109 -> markSuperMethodAsReachable
+    37:42:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2112:2117 -> markSuperMethodAsReachable
+    1:16:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1074:1089 -> markTypeAsLive
+    17:17:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1086:1086 -> markTypeAsLive
+    18:33:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1093:1108 -> markTypeAsLive
+    34:34:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1105:1105 -> markTypeAsLive
+    35:37:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1112:1114 -> markTypeAsLive
+    38:38:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1112:1112 -> markTypeAsLive
+    39:44:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1120:1125 -> markTypeAsLive
+    45:45:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markTypeAsLive
+    45:45:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1125 -> markTypeAsLive
+    46:103:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1128:1185 -> markTypeAsLive
     104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> markTypeAsLive
-    104:104:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.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):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
+    104:104:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1186 -> markTypeAsLive
+    105:105:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1186:1186 -> markTypeAsLive
+    106:106:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1185:1185 -> markTypeAsLive
+    1:5:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1773:1777 -> markVirtualMethodAsLive
+    6:11:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1775:1780 -> markVirtualMethodAsLive
     12:12:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markVirtualMethodAsLive
-    12:12:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):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
+    12:12:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1780 -> markVirtualMethodAsLive
+    1:1:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847:1847 -> markVirtualMethodAsReachable
+    2:29:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1855:1882 -> markVirtualMethodAsReachable
     30:30:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markVirtualMethodAsReachable
-    30:30:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):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
+    30:30:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1882 -> markVirtualMethodAsReachable
+    31:50:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1886:1905 -> markVirtualMethodAsReachable
     51:51:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():248:248 -> markVirtualMethodAsReachable
-    51:51:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):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
-    1:2:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1260:1261 -> processAnnotations
-    1:15:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1438:1452 -> processNewlyInstantiatedClass
+    51:51:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1906 -> markVirtualMethodAsReachable
+    52:52:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1909:1909 -> markVirtualMethodAsReachable
+    1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason newSetWithoutReasonReporter():399:399 -> newSetWithoutReasonReporter
+    1:13:void populateInstantiatedTypesCache(com.android.tools.r8.graph.DexProgramClass):1451:1463 -> populateInstantiatedTypesCache
+    1:1:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1248:1248 -> processAnnotation
+    1:2:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1242:1243 -> processAnnotations
+    1:15:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1423:1437 -> processNewlyInstantiatedClass
     16:16:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> processNewlyInstantiatedClass
-    16:16:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.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):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):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):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):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):3347:3350 -> registerType
-    1:2:void reportMissingClass(com.android.tools.r8.graph.DexType):1390:1391 -> reportMissingClass
+    16:16:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1437 -> processNewlyInstantiatedClass
+    17:24:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1440:1447 -> processNewlyInstantiatedClass
+    1:1:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):326:326 -> registerAnalysis
+    1:2:void registerClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1299:1300 -> registerClassInitializer
+    1:2:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):525:526 -> registerFieldAccess
+    3:31:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod,boolean):531:559 -> registerFieldAccess
+    1:1:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):517:517 -> registerFieldRead
+    1:1:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):521:521 -> registerFieldWrite
+    1:4:boolean registerMethodWithTargetAndContext(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):508:511 -> registerMethodWithTargetAndContext
+    1:2:void reportMissingClass(com.android.tools.r8.graph.DexType):1373:1374 -> reportMissingClass
     3:3:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> reportMissingClass
-    3:3:void reportMissingClass(com.android.tools.r8.graph.DexType):1391 -> reportMissingClass
-    1:2:void reportMissingField(com.android.tools.r8.graph.DexField):1402:1403 -> reportMissingField
+    3:3:void reportMissingClass(com.android.tools.r8.graph.DexType):1374 -> reportMissingClass
+    1:2:void reportMissingField(com.android.tools.r8.graph.DexField):1385:1386 -> reportMissingField
     3:3:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> reportMissingField
-    3:3:void reportMissingField(com.android.tools.r8.graph.DexField):1403 -> reportMissingField
-    1:2:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1396:1397 -> reportMissingMethod
+    3:3:void reportMissingField(com.android.tools.r8.graph.DexField):1386 -> reportMissingField
+    1:2:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1379:1380 -> reportMissingMethod
     3:3:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> reportMissingMethod
-    3:3:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1397 -> reportMissingMethod
-    1:15:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2449:2463 -> shouldMarkLibraryMethodOverrideAsReachable
+    3:3:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1380 -> reportMissingMethod
+    1:15:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2412:2426 -> shouldMarkLibraryMethodOverrideAsReachable
     16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> shouldMarkLibraryMethodOverrideAsReachable
-    16:16:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):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):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):1642:1645 -> transitionDependentItemsForInstantiatedClass
+    16:16:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2426 -> shouldMarkLibraryMethodOverrideAsReachable
+    17:29:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2431:2443 -> shouldMarkLibraryMethodOverrideAsReachable
+    1:2:java.util.Set staticFieldsWrittenOnlyInEnclosingStaticInitializer():365:366 -> staticFieldsWrittenOnlyInEnclosingStaticInitializer
+    1:6:java.util.SortedSet toSortedDescriptorSet(java.util.Set):2224:2229 -> toSortedDescriptorSet
+    1:92:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2245:2336 -> trace
+    93:104:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2335:2346 -> trace
+    105:105:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2344:2344 -> trace
+    1:9:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2142:2150 -> traceApplication
+    1:8:java.util.Set traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2126:2133 -> traceMainDex
+    1:8:void transitionDefaultMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1598:1605 -> transitionDefaultMethodsForInstantiatedClass
+    1:4:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1646:1649 -> transitionDependentItemsForInstantiatedClass
     5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> transitionDependentItemsForInstantiatedClass
-    5:5:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):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
+    5:5:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1649 -> transitionDependentItemsForInstantiatedClass
+    6:7:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1651:1652 -> transitionDependentItemsForInstantiatedClass
+    1:9:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1631:1639 -> transitionFieldsForInstantiatedClass
+    1:22:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1484:1505 -> transitionMethodsForInstantiatedClass
     23:23:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> transitionMethodsForInstantiatedClass
-    23:23:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1520 -> transitionMethodsForInstantiatedClass
-    24:50:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1522:1548 -> transitionMethodsForInstantiatedClass
+    23:23:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1505 -> transitionMethodsForInstantiatedClass
+    24:50:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1507:1533 -> transitionMethodsForInstantiatedClass
     51:51:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> transitionMethodsForInstantiatedClass
-    51:51:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1548 -> transitionMethodsForInstantiatedClass
-    52:56:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1550:1554 -> transitionMethodsForInstantiatedClass
+    51:51:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1533 -> transitionMethodsForInstantiatedClass
+    52:56:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1535:1539 -> transitionMethodsForInstantiatedClass
     57:57:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> transitionMethodsForInstantiatedClass
-    57:57:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1554 -> transitionMethodsForInstantiatedClass
-    58:58:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1556:1556 -> transitionMethodsForInstantiatedClass
-    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():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):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
+    57:57:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1539 -> transitionMethodsForInstantiatedClass
+    58:58:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1541:1541 -> transitionMethodsForInstantiatedClass
+    1:9:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1611:1619 -> transitionNonAbstractMethodsToLiveAndShadow
+    10:10:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1618:1618 -> transitionNonAbstractMethodsToLiveAndShadow
+    11:11:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1615:1615 -> transitionNonAbstractMethodsToLiveAndShadow
+    1:3:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1038:1040 -> transitionReachableVirtualMethods
+    1:5:void unpinLambdaMethods():2350:2354 -> unpinLambdaMethods
+    1:3:boolean verifyKeptGraph():2154:2156 -> verifyKeptGraph
+    1:2:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.DexEncodedMethod):1063:1064 -> verifyMethodIsTargeted
+    1:1:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1069:1069 -> verifyTypeIsLive
+    1:5:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):350:354 -> warnIfLibraryTypeInheritsFromProgramType
 com.android.tools.r8.shaking.Enqueuer$1 -> com.android.tools.r8.shaking.Enqueuer$1:
-    1:1:void <clinit>():2261:2261 -> <clinit>
-    2:2:void <clinit>():990:990 -> <clinit>
+    1:1:void <clinit>():972:972 -> <clinit>
 com.android.tools.r8.shaking.Enqueuer$AnnotationReferenceMarker -> com.android.tools.r8.shaking.Enqueuer$AnnotationReferenceMarker:
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.shaking.Enqueuer$1):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
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.shaking.Enqueuer$1):3001:3001 -> <init>
+    2:5:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason):3008:3011 -> <init>
+    1:1:boolean addField(com.android.tools.r8.graph.DexField):3021:3021 -> addField
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> addField
-    2:2:boolean addField(com.android.tools.r8.graph.DexField):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>():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):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):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>():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>():3319:3319 -> <init>
+    2:2:boolean addField(com.android.tools.r8.graph.DexField):3021 -> addField
+    3:13:boolean addField(com.android.tools.r8.graph.DexField):3025:3035 -> addField
+    14:14:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> addField
+    14:14:boolean addField(com.android.tools.r8.graph.DexField):3035 -> addField
+    15:27:boolean addField(com.android.tools.r8.graph.DexField):3035:3047 -> addField
+    1:10:boolean addMethod(com.android.tools.r8.graph.DexMethod):3055:3064 -> addMethod
+    11:18:boolean addMethod(com.android.tools.r8.graph.DexMethod):3063:3070 -> addMethod
+    1:2:boolean addType(com.android.tools.r8.graph.DexType):3100:3101 -> addType
 com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget -> com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget:
-    1:3:void <clinit>():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
+    1:3:void <clinit>():2907:2909 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):2918:2921 -> <init>
+    1:2:boolean equals(java.lang.Object):2937:2938 -> equals
+    1:1:int hashCode():2931:2931 -> hashCode
     2:2:int com.android.tools.r8.graph.KeyedDexItem.hashCode():20:20 -> hashCode
-    2:2:int hashCode():2948 -> hashCode
-    1:1:boolean isUnresolved():2942:2942 -> isUnresolved
-    1:1:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget unresolved():2932:2932 -> unresolved
+    2:2:int hashCode():2931 -> hashCode
+    1:1:boolean isUnresolved():2925:2925 -> isUnresolved
+    1:1:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget unresolved():2915:2915 -> unresolved
 com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.shaking.Enqueuer$Mode:
-    1:4:void <clinit>():120:123 -> <clinit>
-    5:5:void <clinit>():119:119 -> <clinit>
-    1:1:void <init>(java.lang.String,int):119:119 -> <init>
-    1:1:boolean isFinalTreeShaking():130:130 -> isFinalTreeShaking
-    1:1:boolean isInitialOrFinalTreeShaking():134:134 -> isInitialOrFinalTreeShaking
-    1:1:boolean isInitialTreeShaking():126:126 -> isInitialTreeShaking
-    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
+    1:4:void <clinit>():106:109 -> <clinit>
+    5:5:void <clinit>():105:105 -> <clinit>
+    1:1:void <init>(java.lang.String,int):105:105 -> <init>
+    1:1:boolean isFinalTreeShaking():116:116 -> isFinalTreeShaking
+    1:1:boolean isInitialOrFinalTreeShaking():120:120 -> isInitialOrFinalTreeShaking
+    1:1:boolean isInitialTreeShaking():112:112 -> isInitialTreeShaking
+    1:1:boolean isTracingMainDex():124:124 -> isTracingMainDex
+    1:1:com.android.tools.r8.shaking.Enqueuer$Mode valueOf(java.lang.String):105:105 -> valueOf
+    1:1:com.android.tools.r8.shaking.Enqueuer$Mode[] values():105:105 -> values
 com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet -> com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet:
-    1: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
+    1:4:void <init>():2942:2945 -> <init>
+    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):2942:2942 -> <init>
+    1:8:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):2956:2963 -> add
+    1:1:java.util.Set getMethods():2948:2948 -> getMethods
+    1:1:java.util.Set getReasons(com.android.tools.r8.graph.DexEncodedMethod):2952:2952 -> getReasons
 com.android.tools.r8.shaking.Enqueuer$SetWithReason -> com.android.tools.r8.shaking.Enqueuer$SetWithReason:
-    1:1:void <init>(java.util.function.BiConsumer):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
+    1:1:void <init>(java.util.function.BiConsumer):2889:2889 -> <init>
+    2:7:void <init>(java.util.function.BiConsumer):2885:2890 -> <init>
+    1:1:java.util.Set access$3800(com.android.tools.r8.shaking.Enqueuer$SetWithReason):2883:2883 -> access$3800
+    1:2:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):2894:2895 -> add
+    1:1:boolean contains(java.lang.Object):2899:2899 -> contains
+    1:1:java.util.Set getItems():2903:2903 -> getItems
+com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason -> com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason:
+    1:1:void <clinit>():2865:2865 -> <clinit>
+    1:3:void <init>():2865:2867 -> <init>
+    4:4:void <init>(com.android.tools.r8.shaking.Enqueuer$1):2865:2865 -> <init>
+    1:1:java.util.Set access$3900(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):2865:2865 -> access$3900
+    1:2:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2870:2871 -> add
+    1:1:boolean contains(java.lang.Object):2875:2875 -> contains
+    1:1:java.util.Set getItems():2879:2879 -> getItems
 com.android.tools.r8.shaking.Enqueuer$TargetWithContext -> com.android.tools.r8.shaking.Enqueuer$TargetWithContext:
-    1:3:void <init>(com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexEncodedMethod):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
+    1:3:void <init>(com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexEncodedMethod):2973:2975 -> <init>
+    1:5:boolean equals(java.lang.Object):2993:2997 -> equals
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getContext():2983:2983 -> getContext
+    1:1:com.android.tools.r8.graph.Descriptor getTarget():2979:2979 -> getTarget
+    1:1:int hashCode():2988:2988 -> hashCode
     2:2:int com.android.tools.r8.graph.KeyedDexItem.hashCode():20:20 -> hashCode
-    2:2:int hashCode():3004 -> hashCode
+    2:2:int hashCode():2988 -> hashCode
 com.android.tools.r8.shaking.Enqueuer$UseRegistry -> com.android.tools.r8.shaking.Enqueuer$UseRegistry:
-    1:1:void <clinit>():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>
-    2:6:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):586:590 -> <init>
-    1:1:java.lang.Boolean lambda$registerStaticFieldRead$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):833:833 -> a
-    1:1:java.lang.Boolean lambda$registerStaticFieldWrite$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):878:878 -> b
-    1:64:void registerCallSite(com.android.tools.r8.graph.DexCallSite):944:1007 -> registerCallSite
-    65:74:void registerCallSite(com.android.tools.r8.graph.DexCallSite):995:1004 -> registerCallSite
-    75:75:void registerCallSite(com.android.tools.r8.graph.DexCallSite):998:998 -> registerCallSite
-    76:115:void registerCallSite(com.android.tools.r8.graph.DexCallSite):992:1031 -> registerCallSite
-    1:1:boolean registerCheckCast(com.android.tools.r8.graph.DexType):910:910 -> registerCheckCast
-    1:1:boolean registerConstClass(com.android.tools.r8.graph.DexType):905:905 -> registerConstClass
-    1:10:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):1037:1046 -> registerConstClassOrCheckCast
-    11:11:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):1045:1045 -> registerConstClassOrCheckCast
-    1:20:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):752:771 -> registerInstanceFieldRead
+    1:1:void <clinit>():562:562 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$1):562:562 -> <init>
+    2:6:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):567:571 -> <init>
+    1:1:java.lang.Boolean lambda$registerStaticFieldRead$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):815:815 -> a
+    1:1:java.lang.Boolean lambda$registerStaticFieldWrite$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):860:860 -> b
+    1:65:void registerCallSite(com.android.tools.r8.graph.DexCallSite):926:990 -> registerCallSite
+    66:76:void registerCallSite(com.android.tools.r8.graph.DexCallSite):977:987 -> registerCallSite
+    77:77:void registerCallSite(com.android.tools.r8.graph.DexCallSite):986:986 -> registerCallSite
+    78:78:void registerCallSite(com.android.tools.r8.graph.DexCallSite):980:980 -> registerCallSite
+    79:119:void registerCallSite(com.android.tools.r8.graph.DexCallSite):974:1014 -> registerCallSite
+    1:1:boolean registerCheckCast(com.android.tools.r8.graph.DexType):892:892 -> registerCheckCast
+    1:1:boolean registerConstClass(com.android.tools.r8.graph.DexType):887:887 -> registerConstClass
+    1:10:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):1020:1029 -> registerConstClassOrCheckCast
+    11:11:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):1028:1028 -> registerConstClassOrCheckCast
+    1:20:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):733:752 -> registerInstanceFieldRead
     21:21:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> registerInstanceFieldRead
-    21:21:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):771 -> registerInstanceFieldRead
-    22:30:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):776:784 -> registerInstanceFieldRead
-    31:31:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):783:783 -> registerInstanceFieldRead
-    1:20:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):706:725 -> registerInstanceFieldWrite
+    21:21:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):752 -> registerInstanceFieldRead
+    22:30:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):757:765 -> registerInstanceFieldRead
+    31:31:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):764:764 -> registerInstanceFieldRead
+    1:20:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):687:706 -> registerInstanceFieldWrite
     21:21:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> registerInstanceFieldWrite
-    21:21:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):725 -> registerInstanceFieldWrite
-    22:39:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):729:746 -> registerInstanceFieldWrite
-    1:1:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):624:624 -> registerInvokeDirect
-    2:6:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):628:632 -> registerInvokeDirect
+    21:21:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):706 -> registerInstanceFieldWrite
+    22:39:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):710:727 -> registerInstanceFieldWrite
+    1:1:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):605:605 -> registerInvokeDirect
+    2:6:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):609:613 -> registerInvokeDirect
     7:7:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> registerInvokeDirect
-    7:7:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):632 -> registerInvokeDirect
-    8:8:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):634:634 -> registerInvokeDirect
-    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):675:675 -> registerInvokeInterface
-    2:6:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):679:683 -> registerInvokeInterface
+    7:7:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):613 -> registerInvokeDirect
+    8:8:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):615:615 -> registerInvokeDirect
+    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):656:656 -> registerInvokeInterface
+    2:6:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):660:664 -> registerInvokeInterface
     7:7:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> registerInvokeInterface
-    7:7:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):683 -> registerInvokeInterface
-    8:8:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):685:685 -> registerInvokeInterface
-    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):640:640 -> registerInvokeStatic
-    2:25:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):644:667 -> registerInvokeStatic
+    7:7:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):664 -> registerInvokeInterface
+    8:8:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):666:666 -> registerInvokeInterface
+    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):621:621 -> registerInvokeStatic
+    2:25:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):625:648 -> registerInvokeStatic
     26:26:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> registerInvokeStatic
-    26:26:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):667 -> registerInvokeStatic
-    27:27:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):669:669 -> registerInvokeStatic
-    1:6:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):693:698 -> registerInvokeSuper
+    26:26:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):648 -> registerInvokeStatic
+    27:27:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):650:650 -> registerInvokeStatic
+    1:6:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):674:679 -> registerInvokeSuper
     7:7:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> registerInvokeSuper
-    7:7:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):698 -> registerInvokeSuper
-    8:8:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):700:700 -> registerInvokeSuper
-    1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):599:599 -> registerInvokeVirtual
-    2:9:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):603:610 -> registerInvokeVirtual
-    10:21:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):605:616 -> registerInvokeVirtual
+    7:7:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):679 -> registerInvokeSuper
+    8:8:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):681:681 -> registerInvokeSuper
+    1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):580:580 -> registerInvokeVirtual
+    2:9:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):584:591 -> registerInvokeVirtual
+    10:21:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):586:597 -> registerInvokeVirtual
     22:22:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]) -> registerInvokeVirtual
-    22:22:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):616 -> registerInvokeVirtual
-    23:23:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):618:618 -> registerInvokeVirtual
-    1:1:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):921:921 -> registerMethodHandle
+    22:22:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):597 -> registerInvokeVirtual
+    23:23:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):599:599 -> registerInvokeVirtual
+    1:1:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):903:903 -> registerMethodHandle
     2:2:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> registerMethodHandle
-    2:2:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):928 -> registerMethodHandle
-    3:11:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):928:936 -> registerMethodHandle
-    1:1:boolean registerNewInstance(com.android.tools.r8.graph.DexType):790:790 -> registerNewInstance
-    2:7:boolean registerNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):794:799 -> registerNewInstance
-    1:19:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):807:825 -> registerStaticFieldRead
+    2:2:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):910 -> registerMethodHandle
+    3:11:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):910:918 -> registerMethodHandle
+    1:1:boolean registerNewInstance(com.android.tools.r8.graph.DexType):771:771 -> registerNewInstance
+    2:7:boolean registerNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):776:781 -> registerNewInstance
+    1:19:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):789:807 -> registerStaticFieldRead
     20:20:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> registerStaticFieldRead
-    20:20:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):825 -> registerStaticFieldRead
-    21:27:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):828:834 -> registerStaticFieldRead
-    28:43:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):831:846 -> registerStaticFieldRead
-    1:19:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):852:870 -> registerStaticFieldWrite
+    20:20:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):807 -> registerStaticFieldRead
+    21:27:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):810:816 -> registerStaticFieldRead
+    28:43:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):813:828 -> registerStaticFieldRead
+    1:19:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):834:852 -> registerStaticFieldWrite
     20:20:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> registerStaticFieldWrite
-    20:20:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):870 -> registerStaticFieldWrite
-    21:27:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):873:879 -> registerStaticFieldWrite
-    28:51:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):876:899 -> registerStaticFieldWrite
-    1:1:boolean registerTypeReference(com.android.tools.r8.graph.DexType):915:915 -> registerTypeReference
-    1:1:com.android.tools.r8.shaking.Enqueuer$KeepReasonWitness reportClassReferenced(com.android.tools.r8.graph.DexProgramClass):594:594 -> reportClassReferenced
+    20:20:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):852 -> registerStaticFieldWrite
+    21:27:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):855:861 -> registerStaticFieldWrite
+    28:51:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):858:881 -> registerStaticFieldWrite
+    1:1:boolean registerTypeReference(com.android.tools.r8.graph.DexType):897:897 -> registerTypeReference
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferenced(com.android.tools.r8.graph.DexProgramClass):575:575 -> reportClassReferenced
 com.android.tools.r8.shaking.EnqueuerFactory -> com.android.tools.r8.shaking.EnqueuerFactory:
     1:1:void <init>():12:12 -> <init>
     1:1:com.android.tools.r8.shaking.Enqueuer createForFinalTreeShaking(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):21:21 -> createForFinalTreeShaking
@@ -51853,30 +52086,50 @@
     1:1:void <init>():11:11 -> <init>
     1:3:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap toImmutableSortedMap(java.util.Map,java.util.Comparator):15:17 -> toImmutableSortedMap
 com.android.tools.r8.shaking.EnqueuerWorklist -> com.android.tools.r8.shaking.EnqueuerWorklist:
-    1:1:void <clinit>():16:16 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):48:48 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.AppView):46:49 -> <init>
-    1:1:com.android.tools.r8.shaking.EnqueuerWorklist createWorklist(com.android.tools.r8.graph.AppView):53:53 -> createWorklist
-    1:2:void enqueueMarkFieldKeptAction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):103:104 -> enqueueMarkFieldKeptAction
-    1:2:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):87:88 -> enqueueMarkInstantiatedAction
-    1:2:void enqueueMarkMethodKeptAction(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):98:99 -> enqueueMarkMethodKeptAction
-    1:2:void enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):93:94 -> enqueueMarkMethodLiveAction
-    1:1:void enqueueMarkReachableDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):65:65 -> enqueueMarkReachableDirectAction
-    1:2:void enqueueMarkReachableFieldAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):82:83 -> enqueueMarkReachableFieldAction
-    1:1:void enqueueMarkReachableInterfaceAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):73:73 -> enqueueMarkReachableInterfaceAction
-    1:1:void enqueueMarkReachableSuperAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):77:77 -> enqueueMarkReachableSuperAction
-    1:1:void enqueueMarkReachableVirtualAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):69:69 -> enqueueMarkReachableVirtualAction
-    1:1:boolean isEmpty():57:57 -> isEmpty
-    1:1:com.android.tools.r8.shaking.EnqueuerWorklist$Action poll():61:61 -> poll
+    1:1:void <clinit>():15:15 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):162:162 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.AppView):160:163 -> <init>
+    1:1:com.android.tools.r8.shaking.EnqueuerWorklist createWorklist(com.android.tools.r8.graph.AppView):167:167 -> createWorklist
+    1:2:void enqueueMarkFieldKeptAction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):220:221 -> enqueueMarkFieldKeptAction
+    1:2:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):204:205 -> enqueueMarkInstantiatedAction
+    1:2:void enqueueMarkMethodKeptAction(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):215:216 -> enqueueMarkMethodKeptAction
+    1:2:void enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):210:211 -> enqueueMarkMethodLiveAction
+    1:1:void enqueueMarkReachableDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):179:179 -> enqueueMarkReachableDirectAction
+    1:2:void enqueueMarkReachableFieldAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):196:197 -> enqueueMarkReachableFieldAction
+    1:1:void enqueueMarkReachableInterfaceAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):187:187 -> enqueueMarkReachableInterfaceAction
+    1:1:void enqueueMarkReachableSuperAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):191:191 -> enqueueMarkReachableSuperAction
+    1:1:void enqueueMarkReachableVirtualAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):183:183 -> enqueueMarkReachableVirtualAction
+    1:1:boolean isEmpty():171:171 -> isEmpty
+    1:1:com.android.tools.r8.shaking.EnqueuerWorklist$Action poll():175:175 -> poll
 com.android.tools.r8.shaking.EnqueuerWorklist$Action -> com.android.tools.r8.shaking.EnqueuerWorklist$Action:
-    1:1:void <init>(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.shaking.EnqueuerWorklist$Action$Kind:
-    1:9:void <clinit>():21:29 -> <clinit>
-    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 valueOf(java.lang.String):20:20 -> valueOf
-    1:1:com.android.tools.r8.shaking.EnqueuerWorklist$Action$Kind[] values():20:20 -> values
+    1:1:void <init>():17:17 -> <init>
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkFieldKeptAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkFieldKeptAction:
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):148:150 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):155:155 -> run
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkInstantiatedAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkInstantiatedAction:
+    1:4:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):102:105 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):110:110 -> run
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodKeptAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodKeptAction:
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):133:135 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):140:140 -> run
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodLiveAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodLiveAction:
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):118:120 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):125:125 -> run
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableDirectAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableDirectAction:
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):25:27 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):32:32 -> run
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableFieldAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableFieldAction:
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):85:87 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):92:92 -> run
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableInterfaceAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableInterfaceAction:
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):55:57 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):62:62 -> run
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableSuperAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableSuperAction:
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):70:72 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):77:77 -> run
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableVirtualAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableVirtualAction:
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):40:42 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):47:47 -> run
 com.android.tools.r8.shaking.FilteredClassPath -> com.android.tools.r8.shaking.FilteredClassPath:
     1:5:void <init>(java.nio.file.Path,java.util.List,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):27:31 -> <init>
     6:6:void <init>(java.nio.file.Path):35:35 -> <init>
@@ -51889,6 +52142,83 @@
     1:7:boolean matchesFile(java.lang.String):55:61 -> matchesFile
     1:16:java.lang.String toString():128:143 -> toString
     1:1:com.android.tools.r8.shaking.FilteredClassPath unfiltered(java.nio.file.Path):39:39 -> unfiltered
+com.android.tools.r8.shaking.GraphReporter -> com.android.tools.r8.shaking.GraphReporter:
+    1:1:void <clinit>():45:45 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):59:59 -> <init>
+    2:16:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):52:66 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo lambda$getEdgeInfo$0(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):383:383 -> a
+    2:6:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$1(com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):390:394 -> a
+    7:7:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):402:402 -> a
+    8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    8:8:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):402 -> a
+    9:11:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):403:405 -> a
+    12:12:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):413:413 -> a
+    13:13:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    13:13:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):413 -> a
+    14:26:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):414:426 -> a
+    27:27:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):420:420 -> a
+    28:28:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):434:434 -> a
+    29:29:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    29:29:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):434 -> a
+    30:35:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):435:440 -> a
+    36:36:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):437:437 -> a
+    37:37:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$5(com.android.tools.r8.shaking.ProguardKeepRuleBase,java.util.Set,com.android.tools.r8.shaking.ProguardKeepRuleBase):458:458 -> a
+    38:42:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$6(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardKeepRuleBase):466:470 -> a
+    1:1:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode getAnnotationGraphNode(com.android.tools.r8.graph.DexItem):387:387 -> getAnnotationGraphNode
+    1:1:com.android.tools.r8.experimental.graphinfo.ClassGraphNode getClassGraphNode(com.android.tools.r8.graph.DexType):399:399 -> getClassGraphNode
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.shaking.KeepReason):379:379 -> getEdgeInfo
+    2:2:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):383:383 -> getEdgeInfo
+    1:1:com.android.tools.r8.experimental.graphinfo.FieldGraphNode getFieldGraphNode(com.android.tools.r8.graph.DexField):431:431 -> getFieldGraphNode
+    1:10:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):366:375 -> getGraphNode
+    1:21:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode getKeepRuleGraphNode(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):453:473 -> getKeepRuleGraphNode
+    1:1:com.android.tools.r8.experimental.graphinfo.MethodGraphNode getMethodGraphNode(com.android.tools.r8.graph.DexMethod):410:410 -> getMethodGraphNode
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):362:362 -> getSourceNode
+    1:1:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):357:357 -> isNonProgramClass
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> isNonProgramClass
+    2:2:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):357 -> isNonProgramClass
+    3:3:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):358:358 -> isNonProgramClass
+    1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):320:323 -> registerAnnotation
+    1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):313:316 -> registerClass
+    1:8:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):346:353 -> registerEdge
+    1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):339:342 -> registerField
+    1:5:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):305:309 -> registerInterface
+    1:9:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):327:335 -> registerMethod
+    1:6:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):203:208 -> reportClassReferencedFrom
+    7:12:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):212:217 -> reportClassReferencedFrom
+    1:7:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):244:250 -> reportCompanionClass
+    8:8:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):249:249 -> reportCompanionClass
+    1:7:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):255:261 -> reportCompanionMethod
+    8:8:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):259:259 -> reportCompanionMethod
+    1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):192:195 -> reportCompatInstantiated
+    5:10:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):193:198 -> reportCompatInstantiated
+    1:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):170:171 -> reportCompatKeepDefaultInitializer
+    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.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):171 -> reportCompatKeepDefaultInitializer
+    4:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):171:171 -> reportCompatKeepDefaultInitializer
+    5:5:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> reportCompatKeepDefaultInitializer
+    5:5:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):171 -> reportCompatKeepDefaultInitializer
+    6:9:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):172:175 -> reportCompatKeepDefaultInitializer
+    10:15:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):173:178 -> reportCompatKeepDefaultInitializer
+    1:6:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):182:187 -> reportCompatKeepMethod
+    1:3:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):266:268 -> reportEdge
+    1:6:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexProgramClass):107:112 -> reportKeepClass
+    7:13:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepClass(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexProgramClass):117:123 -> reportKeepClass
+    1:6:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexEncodedField):149:154 -> reportKeepField
+    7:13:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):159:165 -> reportKeepField
+    1:6:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.graph.DexEncodedMethod):128:133 -> reportKeepMethod
+    7:13:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepMethod(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedMethod):138:144 -> reportKeepMethod
+    1:7:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind reportPrecondition(com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode):96:102 -> reportPrecondition
+    1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):222:225 -> reportReachableMethodAsLive
+    5:10:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):223:228 -> reportReachableMethodAsLive
+    11:18:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):233:240 -> reportReachableMethodAsLive
+    1:6:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):296:301 -> skipReporting
+    1:21:boolean verifyRootedPath(com.android.tools.r8.graph.DexProgramClass):71:91 -> verifyRootedPath
+com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness -> com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness:
+    1:1:void <clinit>():278:278 -> <clinit>
+    1:1:void <init>():280:280 -> <init>
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness access$000():276:276 -> access$000
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():286:286 -> edgeKind
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):291:291 -> getSourceNode
 com.android.tools.r8.shaking.IfRuleClassPartEquivalence -> com.android.tools.r8.shaking.IfRuleClassPartEquivalence:
     1:1:void <init>():11:11 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):11:11 -> doEquivalent
@@ -51961,72 +52291,72 @@
     1:1:com.android.tools.r8.shaking.KeepReason invokedFromLambdaCreatedIn(com.android.tools.r8.graph.DexEncodedMethod):44:44 -> invokedFromLambdaCreatedIn
     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 methodHandleReferencedIn(com.android.tools.r8.graph.DexEncodedMethod):76:76 -> methodHandleReferencedIn
     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
+    1:1:com.android.tools.r8.shaking.KeepReason reflectiveUseIn(com.android.tools.r8.graph.DexEncodedMethod):72:72 -> reflectiveUseIn
+    1:1:com.android.tools.r8.shaking.KeepReason targetedBySuperFrom(com.android.tools.r8.graph.DexEncodedMethod):68:68 -> targetedBySuperFrom
 com.android.tools.r8.shaking.KeepReason$AnnotatedOn -> com.android.tools.r8.shaking.KeepReason$AnnotatedOn:
-    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
+    1:1:void <clinit>():261:261 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.KeepReason$1):261:261 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexDefinition):265:266 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():271:271 -> edgeKind
+    1:7:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):276:282 -> 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):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
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):79:79 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod):83:84 -> <init>
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():90:90 -> getMethod
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):95:95 -> 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):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
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):99:99 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):102:102 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():107:107 -> edgeKind
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():99:99 -> getMethod
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):99:99 -> getSourceNode
 com.android.tools.r8.shaking.KeepReason$InvokedFrom -> com.android.tools.r8.shaking.KeepReason$InvokedFrom:
-    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
+    1:1:void <clinit>():150:150 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):150:150 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):153:154 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():159:159 -> 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):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
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):168:168 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):171:171 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():176:176 -> 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):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
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):116:116 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):119:119 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():124:124 -> 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):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
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason$1):221:221 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):226:228 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():233:233 -> edgeKind
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):238:238 -> 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):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):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):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
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():317:317 -> 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):202:202 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexType):206:207 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():212:212 -> edgeKind
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):217:217 -> 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):185:185 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):188:188 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():193:193 -> 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):242:242 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexItem):246:247 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():252:252 -> edgeKind
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):257:257 -> 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):287:287 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):290:290 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():300:300 -> 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):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
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):133:133 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):136:136 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():141:141 -> 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>
@@ -52735,8 +53065,6 @@
     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):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
@@ -53405,7 +53733,7 @@
     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 com.android.tools.r8.graph.DexEncodedField.isStatic():114:114 -> verifyKeptFieldsAreAccessedAndLive
     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
@@ -53530,17 +53858,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():1060:1060 -> reachableMethods
+    16:16:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> reachableMethods
     16:16:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):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():1060:1060 -> reachableMethods
+    31:31:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> reachableMethods
     31:31:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):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():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:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> reachableMethods
+    55:55:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):666 -> reachableMethods
     55:55:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):286 -> 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 com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):667:668 -> reachableMethods
     56:57:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):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
@@ -53661,10 +53989,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():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 com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> merge
+    75:75:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):666 -> merge
     75:75:boolean merge():977 -> 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:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):667:668 -> merge
     76:77:boolean merge():977 -> merge
     78:104:boolean merge():979:1005 -> merge
     105:152:boolean merge():996:1043 -> merge
@@ -54142,8 +54470,9 @@
     1:1:void <clinit>():99:99 -> <clinit>
     1:4:void <init>(com.android.tools.r8.utils.AndroidAppConsumers,com.android.tools.r8.DexIndexedConsumer,com.android.tools.r8.DexIndexedConsumer):99:102 -> <init>
     1:1:void lambda$finished$0(java.lang.Integer,com.android.tools.r8.utils.AndroidAppConsumers$DescriptorsWithContents):120:120 -> a
-    2:2:void addDexFile(int,byte[],java.util.Set):166:166 -> a
     1:2:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):111:112 -> accept
+    3:3:void addDexFile(int,byte[],java.util.Set):166:166 -> accept
+    3:3:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):112 -> accept
     1:7:void finished(com.android.tools.r8.DiagnosticsHandler):117:123 -> finished
     1:2:com.android.tools.r8.DataResourceConsumer getDataResourceConsumer():130:131 -> getDataResourceConsumer
 com.android.tools.r8.utils.AndroidAppConsumers$2$1 -> com.android.tools.r8.utils.h:
@@ -54160,9 +54489,10 @@
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():177:177 -> <clinit>
     1:4:void <init>(com.android.tools.r8.utils.AndroidAppConsumers,com.android.tools.r8.DexFilePerClassFileConsumer,com.android.tools.r8.DexFilePerClassFileConsumer):177:180 -> <init>
-    1:1:void addDexFile(java.lang.String,byte[],java.util.Set):194:194 -> a
-    2:2:void lambda$finished$0(java.lang.String,com.android.tools.r8.utils.AndroidAppConsumers$DescriptorsWithContents):202:202 -> a
+    1:1:void lambda$finished$0(java.lang.String,com.android.tools.r8.utils.AndroidAppConsumers$DescriptorsWithContents):202:202 -> a
     1:2:void accept(java.lang.String,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):188:189 -> accept
+    3:3:void addDexFile(java.lang.String,byte[],java.util.Set):194:194 -> accept
+    3:3:void accept(java.lang.String,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):189 -> accept
     1:7:void finished(com.android.tools.r8.DiagnosticsHandler):199:205 -> finished
     1:2:com.android.tools.r8.DataResourceConsumer getDataResourceConsumer():212:213 -> getDataResourceConsumer
 com.android.tools.r8.utils.AndroidAppConsumers$3$1 -> com.android.tools.r8.utils.i:
@@ -54179,9 +54509,10 @@
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():254:254 -> <clinit>
     1:3:void <init>(com.android.tools.r8.utils.AndroidAppConsumers,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ClassFileConsumer):254:256 -> <init>
-    1:1:void addClassFile(byte[],java.lang.String):265:265 -> a
-    2:2:void lambda$finished$0(com.android.tools.r8.utils.AndroidAppConsumers$DescriptorsWithContents):274:274 -> a
+    1:1:void lambda$finished$0(com.android.tools.r8.utils.AndroidAppConsumers$DescriptorsWithContents):274:274 -> a
     1:2:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):260:261 -> accept
+    3:3:void addClassFile(byte[],java.lang.String):265:265 -> accept
+    3:3:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):261 -> accept
     1:8:void finished(com.android.tools.r8.DiagnosticsHandler):270:277 -> finished
     1:2:com.android.tools.r8.DataResourceConsumer getDataResourceConsumer():284:285 -> getDataResourceConsumer
 com.android.tools.r8.utils.AndroidAppConsumers$4$1 -> com.android.tools.r8.utils.k:
@@ -54210,27 +54541,31 @@
     1:1:void <init>(java.nio.file.Path):38:38 -> <init>
     2:11:void <init>(java.nio.file.Path):31:40 -> <init>
     1:2:void close(com.android.tools.r8.DiagnosticsHandler):51:52 -> a
-    3:10:void writeDelayed(com.android.tools.r8.DiagnosticsHandler):67:74 -> a
-    3:10:void close(com.android.tools.r8.DiagnosticsHandler):54 -> a
-    11:16:void close(com.android.tools.r8.DiagnosticsHandler):55:60 -> a
-    17:22:void handleIOException(java.io.IOException,com.android.tools.r8.DiagnosticsHandler):100:105 -> a
-    23:23:void addDirectory(java.lang.String,com.android.tools.r8.DiagnosticsHandler):111:111 -> a
-    24:29:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):133:138 -> a
-    30:30:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):137:137 -> a
-    31:40:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):133:142 -> a
-    41:41:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):141:141 -> a
-    42:42:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):139:139 -> a
-    43:43:void addFile(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):148:148 -> a
-    44:47:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):171:174 -> a
-    48:52:void writeNextIfAvailable(com.android.tools.r8.DiagnosticsHandler):160:164 -> a
-    48:52:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):175 -> a
-    53:54:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):178:179 -> a
-    55:55:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):178:178 -> a
-    56:56:java.nio.file.Path getPath():190:190 -> a
+    3:7:void writeDelayed(com.android.tools.r8.DiagnosticsHandler):67:71 -> a
+    3:7:void close(com.android.tools.r8.DiagnosticsHandler):54 -> a
+    8:21:void writeDirectoryNow(java.lang.String,com.android.tools.r8.DiagnosticsHandler):115:128 -> a
+    8:21:void writeDelayed(com.android.tools.r8.DiagnosticsHandler):71 -> a
+    8:21:void close(com.android.tools.r8.DiagnosticsHandler):54 -> a
+    22:23:void writeDelayed(com.android.tools.r8.DiagnosticsHandler):73:74 -> a
+    22:23:void close(com.android.tools.r8.DiagnosticsHandler):54 -> a
+    24:29:void close(com.android.tools.r8.DiagnosticsHandler):55:60 -> a
+    30:35:void handleIOException(java.io.IOException,com.android.tools.r8.DiagnosticsHandler):100:105 -> a
+    36:36:void addDirectory(java.lang.String,com.android.tools.r8.DiagnosticsHandler):111:111 -> a
+    37:42:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):133:138 -> a
+    43:43:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):137:137 -> a
+    44:53:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):133:142 -> a
+    54:54:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):141:141 -> a
+    55:55:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):139:139 -> a
+    56:56:void addFile(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):148:148 -> a
+    57:60:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):171:174 -> a
+    61:65:void writeNextIfAvailable(com.android.tools.r8.DiagnosticsHandler):160:164 -> a
+    61:65:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):175 -> a
+    66:67:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):178:179 -> a
+    68:68:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):178:178 -> a
+    69:69:java.nio.file.Path getPath():190:190 -> a
     1:4:java.util.zip.ZipOutputStream getStreamRaw():80:83 -> b
     5:11:java.util.zip.ZipOutputStream getStream(com.android.tools.r8.DiagnosticsHandler):90:96 -> b
-    12:25:void writeDirectoryNow(java.lang.String,com.android.tools.r8.DiagnosticsHandler):115:128 -> b
-    26:28:void writeFileNow(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):153:155 -> b
+    12:14:void writeFileNow(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):153:155 -> b
     1:1:com.android.tools.r8.origin.Origin getOrigin():185:185 -> getOrigin
     1:2:void open():45:46 -> open
 com.android.tools.r8.utils.ArchiveBuilder$1 -> com.android.tools.r8.utils.l:
@@ -54747,291 +55082,292 @@
     25:25:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):96 -> getProgramResource
     26:26:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):96:96 -> getProgramResource
 com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.utils.T:
-    com.android.tools.r8.StringConsumer proguardMapConsumer -> S0
+    int SUPPORTED_DEX_VERSION -> e1
+    com.android.tools.r8.StringConsumer mainDexListConsumer -> S0
+    boolean hasMarker -> f0
     boolean passthroughDexCode -> i
+    com.android.tools.r8.StringConsumer configurationConsumer -> W0
     int callGraphCycleEliminatorMaxDepthThreshold -> K
-    boolean quiet -> b0
+    boolean verbose -> b0
     com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> f
-    boolean enableRedundantConstNumberOptimization -> X
+    boolean enableUninstantiatedTypeOptimization -> X
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> a1
     boolean enableArgumentRemoval -> q
-    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> t0
+    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> J0
     boolean enableClassInlining -> y
-    java.util.List mainDexKeepRules -> J0
+    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> i0
+    boolean skipReadingDexCode -> R0
     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 printCfg -> A0
-    boolean enableStringSwitchConversion -> Q
+    boolean enableMinification -> A0
     boolean enableUnusedArgumentRemoval -> r
-    boolean enableMinification -> z0
-    java.util.Map warningInvalidDebugInfo -> P0
-    boolean processCovariantReturnTypeAnnotations -> v0
+    boolean enableTreeShaking -> z0
+    java.util.Map warningInvalidParameterAnnotations -> P0
+    boolean enableRedundantConstNumberOptimization -> Y
     boolean enableClassStaticizer -> z
-    boolean enableNestBasedAccessDesugaring -> r0
+    boolean enableGeneratedMessageLiteShrinking -> r0
     boolean enableCallSiteOptimizationInfoPropagation -> H
-    boolean enableLambdaMerging -> n0
-    int SUPPORTED_DEX_VERSION -> d1
     boolean enableHorizontalClassMerging -> o
     int classInliningInstructionLimit -> M
-    com.android.tools.r8.StringConsumer usageInformationConsumer -> T0
-    boolean invalidDebugInfoFatal -> c0
-    boolean enableValuePropagation -> V
+    com.android.tools.r8.StringConsumer proguardMapConsumer -> T0
+    boolean quiet -> c0
+    boolean enableRedundantFieldLoadElimination -> V
     boolean enableInliningOfInvokesWithNullableReceivers -> w
-    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> X0
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> Y0
-    com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> S
-    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> h0
+    java.util.List mainDexKeepRules -> K0
+    java.util.Set extensiveLoggingFilter -> h0
     boolean enableNameReflectionOptimization -> E
     com.android.tools.r8.ProgramConsumer programConsumer -> d
-    boolean minimalMainDex -> K0
     int inliningInstructionLimit -> N
-    boolean configurationDebugging -> F0
     boolean enableVerticalClassMerging -> p
-    boolean enableUninstantiatedTypeOptimization -> W
+    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> N0
+    java.util.function.Consumer syntheticProguardRulesConsumer -> c1
+    boolean printCfg -> B0
+    int minApiLevel -> k0
+    boolean enableValuePropagation -> W
     boolean disableInliningOfLibraryMethodOverrides -> x
+    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> X0
     com.android.tools.r8.graph.DexItemFactory itemFactory -> a
-    boolean lookupLibraryBeforeProgram -> w0
-    boolean enableNestReduction -> s0
-    java.util.Map warningInvalidParameterAnnotations -> O0
+    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> b1
+    boolean processCovariantReturnTypeAnnotations -> w0
+    boolean enableNestBasedAccessDesugaring -> s0
+    java.util.Map missingEnclosingMembers -> O0
+    java.util.Set reportedMissingForDesugaring -> d1
     boolean enableStringConcatenationOptimization -> F
     boolean printTimes -> g
-    boolean enableDesugaring -> o0
-    boolean intermediate -> k0
+    boolean enableLambdaMerging -> o0
     com.android.tools.r8.DataResourceConsumer dataResourceConsumer -> e
     boolean enableDynamicTypeOptimization -> m
-    boolean ignoreMainDexMissingClasses -> d0
+    boolean invalidDebugInfoFatal -> d0
     int inliningInstructionAllowance -> O
-    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> U0
+    java.lang.String printCfgFile -> C0
+    com.android.tools.r8.StringConsumer usageInformationConsumer -> U0
     boolean enableNonNullTracking -> u
+    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> Y0
+    com.android.tools.r8.dex.Marker marker -> g0
     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
-    java.util.Set extensiveLoggingFilter -> g0
-    boolean enableInheritanceClassInDexDistributor -> L0
-    boolean debug -> H0
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> Z0
+    boolean minimalMainDex -> L0
+    boolean skipIR -> H0
     boolean enableDeterminismAnalysis -> C
-    int inliningControlFlowResolutionBlocksThreshold -> P
-    java.util.function.Consumer syntheticProguardRulesConsumer -> b1
+    int inliningMonitorEnterValuesAllowance -> P
     boolean enableFieldBitAccessAnalysis -> n
-    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> M0
-    boolean skipIR -> G0
-    boolean ignoreMissingClasses -> C0
-    boolean enableRedundantFieldLoadElimination -> U
+    boolean configurationDebugging -> G0
+    boolean enableInitializedClassesInInstanceMethodsAnalysis -> 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
-    int numberOfThreads -> Y
-    boolean readCompileTimeAnnotations -> l0
-    java.util.Set reportedMissingForDesugaring -> c1
-    java.util.List methodsFilter -> i0
+    boolean lookupLibraryBeforeProgram -> x0
+    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> v0
+    boolean enableNestReduction -> t0
+    com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> T
+    boolean enableDesugaring -> p0
+    boolean intermediate -> l0
     boolean enableServiceLoaderRewriting -> D
-    com.android.tools.r8.StringConsumer mainDexListConsumer -> R0
-    boolean hasMarker -> e0
-    boolean verbose -> a0
-    com.android.tools.r8.StringConsumer configurationConsumer -> V0
-    java.lang.String printCfgFile -> B0
-    com.android.tools.r8.dex.Marker marker -> f0
-    boolean enableEnumValueOptimization -> R
+    int inliningControlFlowResolutionBlocksThreshold -> Q
+    boolean ignoreMainDexMissingClasses -> e0
+    boolean useSmaliSyntax -> a0
+    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> V0
+    boolean enableStringSwitchConversion -> R
     boolean enableUnusedInterfaceRemoval -> s
-    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> I0
-    boolean useSmaliSyntax -> Z
-    boolean skipReadingDexCode -> Q0
+    com.android.tools.r8.utils.InternalOptions$AssertionProcessing assertionProcessing -> F0
+    int numberOfThreads -> Z
+    boolean enableInheritanceClassInDexDistributor -> M0
     java.util.function.BiPredicate dexClassChecksumFilter -> J
     boolean enableInitializedClassesAnalysis -> A
-    boolean $assertionsDisabled -> e1
-    boolean forceProguardCompatibility -> D0
+    boolean debug -> I0
+    boolean ignoreMissingClasses -> D0
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> b
     boolean libraryInterfacesMayHaveStaticInitialization -> l
-    boolean enableTreeShaking -> y0
-    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> u0
+    boolean enableMainDexListCheck -> y0
+    boolean enableEnumValueOptimization -> S
+    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> u0
     boolean enableDevirtualization -> t
-    boolean enableGeneratedMessageLiteShrinking -> q0
+    java.util.List logArgumentsFilter -> n0
+    java.util.Map warningInvalidDebugInfo -> Q0
+    boolean enableGeneratedExtensionRegistryShrinking -> q0
+    java.util.List methodsFilter -> j0
+    boolean readCompileTimeAnnotations -> m0
     boolean enableSideEffectAnalysis -> B
     1:23:void <clinit>():66:88 -> <clinit>
     1:1:void <init>():112:112 -> <init>
-    2: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>
+    2:522:void <init>():106:626 -> <init>
+    523:527:void <init>():113:117 -> <init>
+    528:528:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):121:121 -> <init>
+    529:1049:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):106:626 -> <init>
+    1050:1057:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):122:129 -> <init>
+    1058:1058:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):133:133 -> <init>
+    1059:1579:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):106:626 -> <init>
+    1580:1591:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):134:145 -> <init>
     1:1:boolean hasProguardConfiguration():95:95 -> A
-    1:1:boolean hasUsageInformationConsumer():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():425:425 -> G
-    1:1:boolean isProtoShrinkingEnabled():1078:1078 -> H
-    1:1:boolean isShrinking():421:421 -> I
-    1:1:boolean isStringSwitchConversionEnabled():1074:1074 -> J
-    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():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
+    1:1:boolean hasUsageInformationConsumer():583:583 -> B
+    1:1:boolean isDesugaredLibraryCompilation():311:311 -> C
+    1:1:boolean isGeneratingClassFiles():332:332 -> D
+    1:1:boolean isGeneratingDexIndexed():324:324 -> E
+    1:1:boolean isGeneratingDex():320 -> E
+    2:2:boolean isGeneratingDexFilePerClassFile():328:328 -> E
+    2:2:boolean isGeneratingDex():320 -> E
+    1:1:boolean hasConsumer():295:295 -> F
+    1:1:boolean isInterfaceMethodDesugaringEnabled():1067 -> F
+    2:4:boolean isInterfaceMethodDesugaringEnabled():1070:1072 -> F
+    1:1:boolean isMinifying():427:427 -> G
+    1:1:boolean isProtoShrinkingEnabled():1080:1080 -> H
+    1:1:boolean isShrinking():423:423 -> I
+    1:1:boolean isStringSwitchConversionEnabled():1076:1076 -> J
+    1:32:boolean printWarnings():801:832 -> K
+    33:72:boolean printWarnings():828:867 -> K
+    1:4:boolean shouldDesugarNests():367:370 -> L
+    5:5:boolean isGeneratingClassFiles():332:332 -> L
+    5:5:boolean canUseNestBasedAccess():1050 -> L
+    5:5:boolean shouldDesugarNests():370 -> L
+    1:13:void signalFinishedToConsumers():348:360 -> M
+    1:1:boolean assertionsEnabled():621:621 -> N
+    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():488:496 -> O
+    1:9:java.util.Set getExtensiveLoggingFilter():462:470 -> P
+    1:1:boolean shouldEnableKeepRuleSynthesisForRecompilation():458:458 -> Q
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:2:void setMarker(com.android.tools.r8.dex.Marker):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
+    1:2:void setMarker(com.android.tools.r8.dex.Marker):265:266 -> a
+    3:4:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):270:271 -> a
+    5:11:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):278:284 -> a
+    5:11:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):273 -> a
+    12:12:boolean isGeneratingClassFiles():332:332 -> a
+    12:12:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):285 -> a
+    12:12:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):273 -> a
+    13:16:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):286:289 -> a
+    13:16:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):273 -> a
+    17:17:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):629:629 -> a
+    18:18:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):651:651 -> a
+    19:25:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):745:751 -> a
+    26:26:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):746:746 -> a
+    27:28:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):758:759 -> a
     29:29:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    29:29:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):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
+    29:29:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):761 -> a
+    30:32:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):761:763 -> a
     33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    33:33:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):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
+    33:33:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):764 -> a
+    34:34:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):764:764 -> a
     35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    35:35:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):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):638:641 -> b
+    35:35:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):767 -> a
+    36:36:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):767:767 -> a
+    37:37:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):759:759 -> a
+    38:41:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):772:775 -> a
+    42:46:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):780:784 -> a
+    47:53:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):789:795 -> a
+    54:54:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):790:790 -> a
+    55:55:java.util.List lambda$warningInvalidDebugInfo$3(com.android.tools.r8.origin.Origin):794:794 -> a
+    56:61:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):881:886 -> a
+    62:63:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1021:1022 -> a
+    64:64:boolean canHaveArtCheckCastVerifierBug():1401:1401 -> a
+    1:4:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):640:643 -> b
     5:5:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> b
-    5:5:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):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
+    5:5:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):645 -> b
+    6:8:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):645:647 -> b
+    9:9:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):643:643 -> b
+    10:10:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):629:629 -> b
+    10:10:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):641 -> b
+    11:11:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):667:667 -> b
     12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> b
-    12:12:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):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
+    12:12:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):668 -> b
+    13:15:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):669:671 -> b
+    16:16:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):651:651 -> b
+    16:16:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):672 -> b
+    17:18:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):676:677 -> b
     19:19:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> b
-    19:19:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):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):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
+    19:19:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):679 -> b
+    20:20:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):679:679 -> b
+    21:21:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):739:739 -> b
+    21:21:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):681 -> b
+    22:22:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):681:681 -> b
+    23:23:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):677:677 -> b
+    24:24:java.util.List lambda$warningInvalidParameterAnnotations$2(com.android.tools.r8.origin.Origin):783:783 -> b
+    25:26:boolean canHaveArtInstanceOfVerifierBug():1356:1357 -> b
+    1:4:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):633:636 -> c
+    5:5:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):629:629 -> c
+    5:5:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):634 -> c
+    6:6:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):655:655 -> c
     7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> c
-    7:7:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):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():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):683:685 -> d
-    6:11:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):699:704 -> d
+    7:7:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):656 -> c
+    8:8:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):657:657 -> c
+    9:9:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):651:651 -> c
+    9:9:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):658 -> c
+    10:10:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):662:662 -> c
+    11:11:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):739:739 -> c
+    11:11:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):662 -> c
+    12:12:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):662:662 -> c
+    13:13:java.util.List lambda$warningMissingEnclosingMember$1(com.android.tools.r8.origin.Origin):774:774 -> c
+    14:14:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1433:1433 -> c
+    1:1:boolean isGeneratingClassFiles():332:332 -> d
+    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1447 -> d
+    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1447:1447 -> d
+    3:5:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):685:687 -> d
+    6:11:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):701:706 -> d
     12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> d
-    12:12:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):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):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():330:330 -> g
-    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1091 -> g
-    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1091:1091 -> g
-    1:1:boolean isGeneratingClassFiles():330:330 -> h
-    1:1:boolean canUseConstantMethodHandle():1032 -> h
-    2:2:boolean canUseConstantMethodHandle():1032:1032 -> h
-    1:1:boolean isGeneratingClassFiles():330:330 -> i
-    1:1:boolean canUseConstantMethodType():1036 -> i
-    2:2:boolean canUseConstantMethodType():1036:1036 -> i
-    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():330:330 -> l
-    1:1:boolean canUseInvokeCustom():1040 -> l
-    2:2:boolean canUseInvokeCustom():1040:1040 -> l
-    1:1:boolean isGeneratingClassFiles():330:330 -> m
-    1:1:boolean canUseInvokePolymorphic():1028 -> m
-    2:2:boolean canUseInvokePolymorphic():1028:1028 -> m
-    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():330:330 -> p
-    1:1:boolean canUseNotInstruction():1149 -> p
-    2:2:boolean canUseNotInstruction():1149:1149 -> p
-    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():330:330 -> s
-    1:1:boolean canUseSuppressedExceptions():1087 -> s
-    2:2:boolean canUseSuppressedExceptions():1087:1087 -> s
-    1:1:boolean isGeneratingClassFiles():330:330 -> t
-    1:1:boolean canUseTwrCloseResourceMethod():1056 -> t
-    2:2:boolean canUseTwrCloseResourceMethod():1056:1056 -> t
+    12:12:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):706 -> d
+    13:40:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):708:735 -> d
+    1:1:boolean isGeneratingClassFiles():332:332 -> e
+    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1103 -> e
+    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1103:1103 -> e
+    3:5:java.lang.String messageWarningMissingNestHost(com.android.tools.r8.graph.DexClass):694:696 -> e
+    1:1:boolean isGeneratingClassFiles():332:332 -> f
+    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1054 -> f
+    2:2:boolean canLeaveStaticInterfaceMethodInvokes():1054:1054 -> f
+    1:1:boolean isGeneratingClassFiles():332:332 -> g
+    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1093 -> g
+    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1093:1093 -> g
+    1:1:boolean isGeneratingClassFiles():332:332 -> h
+    1:1:boolean canUseConstantMethodHandle():1034 -> h
+    2:2:boolean canUseConstantMethodHandle():1034:1034 -> h
+    1:1:boolean isGeneratingClassFiles():332:332 -> i
+    1:1:boolean canUseConstantMethodType():1038 -> i
+    2:2:boolean canUseConstantMethodType():1038:1038 -> i
+    1:1:boolean isGeneratingClassFiles():332:332 -> j
+    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1046 -> j
+    2:2:boolean canUseDefaultAndStaticInterfaceMethods():1046:1046 -> j
+    1:2:boolean canUseFilledNewArrayOfObjects():1115:1116 -> k
+    1:1:boolean isGeneratingClassFiles():332:332 -> l
+    1:1:boolean canUseInvokeCustom():1042 -> l
+    2:2:boolean canUseInvokeCustom():1042:1042 -> l
+    1:1:boolean isGeneratingClassFiles():332:332 -> m
+    1:1:boolean canUseInvokePolymorphic():1030 -> m
+    2:2:boolean canUseInvokePolymorphic():1030:1030 -> m
+    1:1:boolean isGeneratingClassFiles():332:332 -> n
+    1:1:boolean canUseInvokePolymorphicOnVarHandle():1026 -> n
+    2:2:boolean canUseInvokePolymorphicOnVarHandle():1026:1026 -> n
+    1:2:boolean canUseMultidex():1084:1085 -> o
+    1:1:boolean isGeneratingClassFiles():332:332 -> p
+    1:1:boolean canUseNotInstruction():1151 -> p
+    2:2:boolean canUseNotInstruction():1151:1151 -> p
+    1:1:boolean isGeneratingClassFiles():332:332 -> q
+    1:1:boolean canUsePrivateInterfaceMethods():1062 -> q
+    2:2:boolean canUsePrivateInterfaceMethods():1062:1062 -> q
+    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1124:1125 -> r
+    1:1:boolean isGeneratingClassFiles():332:332 -> s
+    1:1:boolean canUseSuppressedExceptions():1089 -> s
+    2:2:boolean canUseSuppressedExceptions():1089:1089 -> s
+    1:1:boolean isGeneratingClassFiles():332:332 -> t
+    1:1:boolean canUseTwrCloseResourceMethod():1058 -> t
+    2:2:boolean canUseTwrCloseResourceMethod():1058:1058 -> t
     1:4:void disableAllOptimizations():149:152 -> u
     1:17:void disableGlobalOptimizations():156:172 -> v
-    1:1:void disableNameReflectionOptimization():1015:1015 -> w
-    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:void disableNameReflectionOptimization():1017:1017 -> w
+    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():299:299 -> x
+    2:2:boolean hasConsumer():295:295 -> x
+    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():299 -> x
+    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():299:299 -> x
+    4:4:boolean isGeneratingDexIndexed():324:324 -> x
+    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():300 -> x
+    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():301:301 -> x
+    6:6:boolean isGeneratingDexFilePerClassFile():328:328 -> x
+    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():302 -> x
+    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():303:303 -> x
+    8:8:boolean isGeneratingClassFiles():332:332 -> x
+    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():304 -> x
+    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():305:307 -> x
     1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():99:99 -> y
-    1:1:boolean hasMethodsFilter():874:874 -> z
+    1:1:boolean hasMethodsFilter():876:876 -> z
 com.android.tools.r8.utils.InternalOptions$AssertionProcessing -> com.android.tools.r8.utils.T$a:
     com.android.tools.r8.utils.InternalOptions$AssertionProcessing LEAVE -> a
     com.android.tools.r8.utils.InternalOptions$AssertionProcessing REMOVE -> b
@@ -55042,7 +55378,7 @@
     int expectedParameterCount -> b
     int actualParameterCount -> c
     com.android.tools.r8.graph.DexMethod method -> a
-    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):538:541 -> <init>
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):540:543 -> <init>
 com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.utils.T$c:
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization ON -> b
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization OFF -> a
@@ -55053,16 +55389,16 @@
     boolean enabled -> a
     int minSize -> b
     int maxSize -> c
-    1:9:void <init>():906:914 -> <init>
+    1:9:void <init>():908:916 -> <init>
 com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.utils.T$e:
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] $VALUES -> d
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode FLATTEN -> c
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode REPACKAGE -> b
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode NONE -> a
-    1:5:void <clinit>():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
+    1:5:void <clinit>():901:905 -> <clinit>
+    6:6:void <clinit>():899:899 -> <clinit>
+    1:1:void <init>(java.lang.String,int):899:899 -> <init>
+    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] values():899:899 -> a
 com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.utils.T$f:
     boolean invertConditionals -> m
     boolean dontCreateMarkerInD8 -> o
@@ -55099,20 +55435,20 @@
     boolean addCallEdgesForLibraryInvokes -> c
     java.io.PrintStream whyAreYouNotInliningConsumer -> B
     boolean verifyKeptGraphInfo -> D
-    1:85:void <init>():917:1001 -> <init>
+    1:85:void <init>():919:1003 -> <init>
 com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.utils.T$f$a:
     java.util.Comparator interfaceMethodOrdering -> a
-    1:3:void <init>():987:989 -> <init>
-    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):993:994 -> a
-    3:3:int lambda$getInterfaceMethodOrderingOrDefault$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):994:994 -> a
+    1:3:void <init>():989:991 -> <init>
+    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):995:996 -> a
+    3:3:int lambda$getInterfaceMethodOrderingOrDefault$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):996:996 -> a
 com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.utils.T$f$b:
     int numberOfProguardIfRuleMemberEvaluations -> b
     int numberOfProguardIfRuleClassEvaluations -> a
-    1:4:void <init>():1004:1007 -> <init>
+    1:4:void <init>():1006:1009 -> <init>
 com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.utils.T$g:
     com.android.tools.r8.graph.DexType type -> b
     int version -> a
-    1:3:void <init>(int,com.android.tools.r8.graph.DexType):550:552 -> <init>
+    1:3:void <init>(int,com.android.tools.r8.graph.DexType):552:554 -> <init>
 com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.utils.U:
     com.android.tools.r8.utils.InternalOutputMode DexIndexed -> a
     com.android.tools.r8.utils.InternalOutputMode DexFilePerClassFile -> b
@@ -55121,14 +55457,24 @@
     1:1:void <init>(java.lang.String,int):7:7 -> <init>
     1:1:boolean isGeneratingClassFiles():13:13 -> a
     1:1:boolean isGeneratingDex():17:17 -> b
-com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.utils.V:
+com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.utils.W:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():15:15 -> <clinit>
-    1:4:java.lang.Object peekNext(java.util.ListIterator):24:27 -> a
-    5:8:void removeIf(java.util.Iterator,java.util.function.Predicate):34:37 -> a
-    9:21:boolean anyRemainingMatch(java.util.ListIterator,java.util.function.Predicate):57:69 -> a
-    1:3:java.lang.Object peekPrevious(java.util.ListIterator):17:19 -> b
-com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.utils.X:
+    1:1:void <clinit>():16:16 -> <clinit>
+    1:1:java.util.Iterator filter(java.util.Iterator,java.util.function.Predicate):19:19 -> a
+    2:5:java.lang.Object peekNext(java.util.ListIterator):59:62 -> a
+    6:18:boolean anyRemainingMatch(java.util.ListIterator,java.util.function.Predicate):92:104 -> a
+    1:3:java.lang.Object peekPrevious(java.util.ListIterator):52:54 -> b
+    4:7:void removeIf(java.util.Iterator,java.util.function.Predicate):69:72 -> b
+com.android.tools.r8.utils.IteratorUtils$1 -> com.android.tools.r8.utils.V:
+    java.util.Iterator val$iterator -> b
+    java.util.function.Predicate val$predicate -> c
+    java.lang.Object next -> a
+    1:3:void <init>(java.util.Iterator,java.util.function.Predicate):19:21 -> <init>
+    1:3:java.lang.Object advance():25:27 -> f
+    1:1:boolean hasNext():36:36 -> hasNext
+    1:5:java.lang.Object next():41:45 -> next
+    6:6:java.lang.Object next():43:43 -> next
+com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.utils.Y:
     int columnCapacity -> b
     int rowCapacity -> a
     1:3:void <init>(int,int,float):31:33 -> <init>
@@ -55136,11 +55482,11 @@
     2:2:java.util.Map lambda$put$0(java.lang.Object):46:46 -> a
     3:4:java.lang.Object put(java.lang.Object,java.lang.Object,java.lang.Object):46:47 -> a
     1:1:boolean removeEldestEntry(java.util.Map$Entry):42:42 -> removeEldestEntry
-com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.utils.W:
+com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.utils.X:
     int columnCapacity -> a
     1:2:void <init>(int,float):17:18 -> <init>
     1:1:boolean removeEldestEntry(java.util.Map$Entry):23:23 -> removeEldestEntry
-com.android.tools.r8.utils.LebUtils -> com.android.tools.r8.utils.Y:
+com.android.tools.r8.utils.LebUtils -> com.android.tools.r8.utils.Z:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:6:int parseSleb128(com.android.tools.r8.dex.BinaryReader):65:70 -> a
@@ -55151,7 +55497,7 @@
     17:21:void putUleb128(com.android.tools.r8.dex.DexOutputBuffer,int):48:52 -> b
     1:1:int sizeAsSleb128(int):110:110 -> c
     1:1:int sizeAsUleb128(int):57:57 -> d
-com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.utils.Z:
+com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.utils.a0:
     1:1:void <init>(com.android.tools.r8.utils.ClassProvider):15:15 -> <init>
     1:1:java.util.function.Supplier getTransparentSupplier(com.android.tools.r8.graph.DexClass):13:13 -> a
     2:2:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):13:13 -> a
@@ -55161,7 +55507,7 @@
     6:6:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):13 -> a
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():34:34 -> c
     1:1:java.lang.String toString():39:39 -> toString
-com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.utils.g0:
+com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.utils.h0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():54:54 -> <clinit>
     1:10:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):167:176 -> a
@@ -55194,7 +55540,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):1097:1097 -> a
+    293:293:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1095:1095 -> 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
@@ -55208,7 +55554,7 @@
     323:323:java.util.List lambda$groupMethodsByRenamedName$5(com.android.tools.r8.graph.DexString):380:380 -> a
     324:329:boolean doesContainPositions(com.android.tools.r8.graph.DexCode):401:406 -> a
     330:332:boolean doesContainPositions(com.android.tools.r8.graph.CfCode):414:416 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.utils.a0:
+com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.utils.b0:
     com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper val$positionRemapper -> i
     com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter val$positionEventEmitter -> h
     boolean $assertionsDisabled -> l
@@ -55227,11 +55573,11 @@
     32:33:void visit(com.android.tools.r8.graph.DexDebugEvent$EndLocal):502:503 -> a
     34:35:void visit(com.android.tools.r8.graph.DexDebugEvent$RestartLocal):508:509 -> a
     1:3:void flushPc():446:448 -> f
-com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.utils.b0:
+com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.utils.c0:
     1:1:void <init>():63:63 -> <init>
     2:2:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):63:63 -> <init>
     1:1:com.android.tools.r8.ir.code.Position createRemappedPosition(int,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):67:67 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.utils.c0:
+com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.utils.d0:
     int obfuscatedLine -> d
     int originalLine -> b
     com.android.tools.r8.ir.code.Position caller -> c
@@ -55242,7 +55588,7 @@
     1:1:int access$200(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):148:148 -> b
     1:1:int access$300(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):148:148 -> c
     1:1:com.android.tools.r8.ir.code.Position access$400(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):148:148 -> d
-com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.utils.d0:
+com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.utils.e0:
     boolean $assertionsDisabled -> e
     int nextOptimizedLineNumber -> d
     com.android.tools.r8.graph.DexMethod previousMethod -> b
@@ -55252,7 +55598,7 @@
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):77:77 -> <init>
     2:10:void <init>(com.android.tools.r8.utils.InternalOptions):73:81 -> <init>
     1:12:com.android.tools.r8.ir.code.Position createRemappedPosition(int,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):87:98 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.utils.e0:
+com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.utils.f0:
     java.util.List processedEvents -> f
     boolean $assertionsDisabled -> g
     int previousPc -> d
@@ -55270,12 +55616,15 @@
     3:15:void access$800(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int,com.android.tools.r8.ir.code.Position):105 -> a
     16:17:int getStartLine():142:143 -> a
     16:17:int access$900(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter):105 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.utils.f0:
+com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.utils.g0:
     com.android.tools.r8.ir.code.Position createRemappedPosition(int,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position) -> a
-com.android.tools.r8.utils.ListUtils -> com.android.tools.r8.utils.h0:
-    1:2:int lastIndexMatching(java.util.List,java.util.function.Predicate):16:17 -> a
-    3:5:java.util.List map(java.util.Collection,java.util.function.Function):25:27 -> a
-com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.utils.i0:
+com.android.tools.r8.utils.ListUtils -> com.android.tools.r8.utils.i0:
+    1:1:void <clinit>():13:13 -> <clinit>
+    1:1:java.lang.Object first(java.util.List):16:16 -> a
+    2:3:int lastIndexMatching(java.util.List,java.util.function.Predicate):25:26 -> a
+    4:6:java.util.List map(java.util.Collection,java.util.function.Function):34:36 -> a
+    1:2:boolean verifyListIsOrdered(java.util.List):42:43 -> b
+com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.utils.j0:
     long max -> b
     long min -> a
     boolean $assertionsDisabled -> c
@@ -55291,7 +55640,7 @@
     1:2:boolean equals(java.lang.Object):66:67 -> equals
     1:1:int hashCode():58:58 -> hashCode
     1:1:java.lang.String toString():74:74 -> toString
-com.android.tools.r8.utils.MainDexList -> com.android.tools.r8.utils.j0:
+com.android.tools.r8.utils.MainDexList -> com.android.tools.r8.utils.k0:
     1:9:com.android.tools.r8.graph.DexType parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):21:29 -> a
     10:10:com.android.tools.r8.graph.DexType parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):26:26 -> a
     11:11:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
@@ -55306,7 +55655,7 @@
     33:33:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
     33:33:java.util.Set parseList(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory):37 -> a
     34:34:java.util.Set parseList(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory):37:37 -> a
-com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.utils.k0:
+com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.utils.l0:
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE -> b
     boolean ignoreName -> a
@@ -55328,7 +55677,7 @@
     6:6:int com.android.tools.r8.graph.DexTypeList.hashCode():33:33 -> doHash
     6:6:int doHash(com.android.tools.r8.graph.DexMethod):50 -> doHash
     6:6:int doHash(java.lang.Object):15 -> doHash
-com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.utils.l0:
+com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.utils.m0:
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE -> b
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     boolean ignoreName -> a
@@ -55342,14 +55691,14 @@
     1:1:int doHash(java.lang.Object):14:14 -> doHash
     2:5:int doHash(com.android.tools.r8.graph.DexMethod):45:48 -> doHash
     2:5:int doHash(java.lang.Object):14 -> doHash
-com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.utils.m0:
+com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.utils.n0:
     com.android.tools.r8.utils.OffOrAuto Auto -> b
     com.android.tools.r8.utils.OffOrAuto Off -> a
     com.android.tools.r8.utils.OffOrAuto[] $VALUES -> c
     1:1:void <clinit>():11:11 -> <clinit>
     2:2:void <clinit>():10:10 -> <clinit>
     1:1:void <init>(java.lang.String,int):10:10 -> <init>
-com.android.tools.r8.utils.OneShotByteResource -> com.android.tools.r8.utils.n0:
+com.android.tools.r8.utils.OneShotByteResource -> com.android.tools.r8.utils.o0:
     com.android.tools.r8.origin.Origin origin -> a
     java.util.Set classDescriptors -> d
     boolean $assertionsDisabled -> e
@@ -55362,7 +55711,7 @@
     1:1:java.util.Set getClassDescriptors():54:54 -> getClassDescriptors
     1:1:com.android.tools.r8.ProgramResource$Kind getKind():41:41 -> getKind
     1:1:com.android.tools.r8.origin.Origin getOrigin():36:36 -> getOrigin
-com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.utils.o0:
+com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.utils.p0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:13:java.lang.String tryParseSingle(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String,java.lang.String):37:49 -> a
@@ -55370,14 +55719,14 @@
     19:19:java.lang.String tryParseSingle(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String,java.lang.String):41:41 -> a
     20:27:java.lang.Boolean tryParseBoolean(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String):60:67 -> a
     1:11:java.util.List tryParseMulti(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String):18:28 -> b
-com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.utils.o0$a:
+com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.utils.p0$a:
     java.lang.String[] args -> a
     int nextIndex -> b
     1:1:void <init>(java.lang.String[]):76:76 -> <init>
     2:5:void <init>(java.lang.String[]):74:77 -> <init>
     1:1:java.lang.String head():81:81 -> a
     1:5:java.lang.String next():85:89 -> b
-com.android.tools.r8.utils.OrderedMergingIterator -> com.android.tools.r8.utils.p0:
+com.android.tools.r8.utils.OrderedMergingIterator -> com.android.tools.r8.utils.q0:
     java.util.List other -> b
     java.util.List one -> a
     int otherIndex -> d
@@ -55400,14 +55749,14 @@
     17:17:com.android.tools.r8.graph.KeyedDexItem next():44 -> next
     18:25:com.android.tools.r8.graph.KeyedDexItem next():46:53 -> next
     26:26:com.android.tools.r8.graph.KeyedDexItem next():51:51 -> next
-com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.utils.q0:
+com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.utils.r0:
     void addDirectory(java.lang.String,com.android.tools.r8.DiagnosticsHandler) -> a
     void addFile(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler) -> a
     void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler) -> a
     void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler) -> a
     void close(com.android.tools.r8.DiagnosticsHandler) -> a
     java.nio.file.Path getPath() -> a
-com.android.tools.r8.utils.Pair -> com.android.tools.r8.utils.r0:
+com.android.tools.r8.utils.Pair -> com.android.tools.r8.utils.s0:
     java.lang.Object second -> b
     java.lang.Object first -> a
     1:3:void <init>(java.lang.Object,java.lang.Object):23:25 -> <init>
@@ -55417,7 +55766,7 @@
     2:2:void setSecond(java.lang.Object):41:41 -> b
     1:1:boolean equals(java.lang.Object):51:51 -> equals
     1:1:int hashCode():46:46 -> hashCode
-com.android.tools.r8.utils.PreloadedClassFileProvider -> com.android.tools.r8.utils.s0:
+com.android.tools.r8.utils.PreloadedClassFileProvider -> com.android.tools.r8.utils.t0:
     java.util.Map content -> a
     1:1:void <init>(java.util.Map,com.android.tools.r8.utils.PreloadedClassFileProvider$1):19:19 -> <init>
     2:3:void <init>(java.util.Map):37:38 -> <init>
@@ -55427,8 +55776,8 @@
     1:6:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):48:53 -> getProgramResource
     7:7:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):52:52 -> getProgramResource
     1:1:java.lang.String toString():64:64 -> toString
-com.android.tools.r8.utils.PreloadedClassFileProvider$1 -> com.android.tools.r8.utils.s0$a:
-com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.utils.s0$b:
+com.android.tools.r8.utils.PreloadedClassFileProvider$1 -> com.android.tools.r8.utils.t0$a:
+com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.utils.t0$b:
     java.util.Map content -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():74:74 -> <clinit>
@@ -55437,36 +55786,36 @@
     3:3:void <init>():76:76 -> <init>
     1:5:com.android.tools.r8.utils.PreloadedClassFileProvider$Builder addResource(java.lang.String,byte[]):82:86 -> a
     6:8:com.android.tools.r8.utils.PreloadedClassFileProvider build():91:93 -> a
-com.android.tools.r8.utils.PreloadedClassFileProvider$ClassDescriptorOrigin -> com.android.tools.r8.utils.s0$c:
+com.android.tools.r8.utils.PreloadedClassFileProvider$ClassDescriptorOrigin -> com.android.tools.r8.utils.t0$c:
     java.lang.String descriptor -> a
     1:2:void <init>(java.lang.String):25:26 -> <init>
     1:1:java.lang.String part():31:31 -> part
-com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.utils.t0:
+com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.utils.u0:
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver conflictResolver -> d
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():23:23 -> <clinit>
-    1:2:void <init>(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):41:42 -> <init>
-    1:1:java.util.function.Supplier getTransparentSupplier(com.android.tools.r8.graph.DexClass):23:23 -> a
-    2:2:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):23:23 -> a
-    3:3:com.android.tools.r8.graph.DexProgramClass resolveClassConflict(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):52:52 -> a
-    3:3:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):23 -> a
-    4:9:com.android.tools.r8.utils.ProgramClassCollection create(java.util.List,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):30:35 -> a
-    10:10:java.util.function.Supplier lambda$create$0(com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver,java.util.function.Supplier,java.util.function.Supplier):33:33 -> a
-    11:11:com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver disallowClassConflictsResolver(com.android.tools.r8.utils.Reporter):66:66 -> a
-    12:17: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):67:72 -> a
-    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: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):76:78 -> a
-    26:26:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    26:26:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):79 -> a
+    1:1:void <clinit>():24:24 -> <clinit>
+    1:2:void <init>(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):42:43 -> <init>
+    1:1:java.util.function.Supplier getTransparentSupplier(com.android.tools.r8.graph.DexClass):24:24 -> a
+    2:2:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):24:24 -> a
+    3:3:com.android.tools.r8.graph.DexProgramClass resolveClassConflict(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):53:53 -> a
+    3:3:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):24 -> a
+    4:9:com.android.tools.r8.utils.ProgramClassCollection create(java.util.List,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):31:36 -> a
+    10:10:java.util.function.Supplier lambda$create$0(com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver,java.util.function.Supplier,java.util.function.Supplier):34:34 -> a
+    11:11:com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver disallowClassConflictsResolver(com.android.tools.r8.utils.Reporter):67:67 -> a
+    12:17: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):68:73 -> a
+    18:23:boolean assumeClassesAreEqual(com.android.tools.r8.graph.DexProgramClass):85:90 -> a
+    18: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):74 -> a
+    24:26:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77:79 -> a
     27:27:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    27:27:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):79 -> a
-    28:28:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):79:79 -> a
-    29:31:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    29:31:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):76 -> a
-    1:1:com.android.tools.r8.graph.ClassKind getClassKind():62:62 -> c
-    1:1:java.lang.String toString():47:47 -> toString
-com.android.tools.r8.utils.Reporter -> com.android.tools.r8.utils.u0:
+    27:27:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):80 -> a
+    28:28:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
+    28:28:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):80 -> a
+    29:29:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):80:80 -> a
+    30:32:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
+    30:32:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77 -> a
+    1:1:com.android.tools.r8.graph.ClassKind getClassKind():63:63 -> c
+    1:1:java.lang.String toString():48:48 -> toString
+com.android.tools.r8.utils.Reporter -> com.android.tools.r8.utils.v0:
     com.android.tools.r8.DiagnosticsHandler clientHandler -> a
     com.android.tools.r8.Diagnostic lastError -> c
     java.util.Collection suppressedExceptions -> d
@@ -55479,17 +55828,20 @@
     6:8:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
     9:27:void failIfPendingErrors():89:107 -> a
     28:28:java.lang.Throwable addSuppressedExceptions(java.lang.Throwable):111:111 -> a
-    1:1:java.lang.RuntimeException fatalError(java.lang.String):63:63 -> b
-    2:4:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic):71:73 -> b
-    2:4:java.lang.RuntimeException fatalError(java.lang.String):63 -> b
+    1:4:void error(com.android.tools.r8.Diagnostic,java.lang.Throwable):53:56 -> b
+    1:4:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic,java.lang.Throwable):80 -> b
+    5:6:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic,java.lang.Throwable):81:82 -> b
+    7:7:java.lang.RuntimeException fatalError(java.lang.String):63:63 -> b
+    8:10:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic):71:73 -> b
+    8:10:java.lang.RuntimeException fatalError(java.lang.String):63 -> b
     1:3:void error(com.android.tools.r8.Diagnostic):43:45 -> error
     1:1:void info(com.android.tools.r8.Diagnostic):33:33 -> info
     1:1:void warning(com.android.tools.r8.Diagnostic):38:38 -> warning
-com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.utils.u0$a:
+com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.utils.v0$a:
     1:1:void <init>():24:24 -> <init>
-com.android.tools.r8.utils.SingletonEquivalence -> com.android.tools.r8.utils.v0:
+com.android.tools.r8.utils.SingletonEquivalence -> com.android.tools.r8.utils.w0:
     1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.utils.StreamUtils -> com.android.tools.r8.utils.w0:
+com.android.tools.r8.utils.StreamUtils -> com.android.tools.r8.utils.x0:
     1:2:byte[] StreamToByteArrayClose(java.io.InputStream):16:17 -> a
 com.android.tools.r8.utils.StringDiagnostic -> com.android.tools.r8.utils.StringDiagnostic:
     com.android.tools.r8.origin.Origin origin -> a
@@ -55501,7 +55853,7 @@
     1:1:java.lang.String getDiagnosticMessage():53:53 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():43:43 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():48:48 -> getPosition
-com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.utils.x0:
+com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.utils.y0:
     char[] EMPTY_CHAR_ARRAY -> a
     java.lang.String LINE_SEPARATOR -> c
     java.lang.String[] EMPTY_ARRAY -> b
@@ -55539,7 +55891,7 @@
     1:9:java.lang.String toASCIIString(java.lang.String):49:57 -> d
     1:9:java.lang.String trim(java.lang.String):288:296 -> e
     1:5:java.lang.String withNativeLineSeparator(java.lang.String):155:159 -> f
-com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.utils.x0$a:
+com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.utils.y0$a:
     com.android.tools.r8.utils.StringUtils$BraceType SQUARE -> b
     com.android.tools.r8.utils.StringUtils$BraceType TUBORG -> c
     com.android.tools.r8.utils.StringUtils$BraceType PARENS -> a
@@ -55548,7 +55900,7 @@
     1:4:void <clinit>():22:25 -> <clinit>
     5:5:void <clinit>():21:21 -> <clinit>
     1:1:void <init>(java.lang.String,int):21:21 -> <init>
-com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.utils.y0:
+com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.utils.z0:
     char[] IDENTIFIER_CHARACTERS -> b
     boolean $assertionsDisabled -> e
     java.util.Set PRIMITIVE_TYPE_NAMES -> a
@@ -55557,7 +55909,7 @@
     1:15:void <clinit>():13:27 -> <clinit>
     1:1:java.lang.String numberToIdentifier(int,com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing):31:31 -> a
     2:35:java.lang.String numberToIdentifier(int,com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing,char[],boolean):43:76 -> a
-com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.utils.y0$a:
+com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.utils.z0$a:
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing DONT_USE_MIXED_CASE -> b
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing USE_MIXED_CASE -> a
     1:2:void <clinit>():16:17 -> <clinit>
@@ -55568,27 +55920,27 @@
     1:2:java.util.concurrent.ExecutorService getExecutorService(int):48:49 -> getExecutorService
     3:3:java.util.concurrent.ExecutorService getExecutorService(com.android.tools.r8.utils.InternalOptions):53:53 -> getExecutorService
     1:2:java.util.concurrent.ExecutorService getExecutorServiceForProcessors(int):41:42 -> getExecutorServiceForProcessors
-com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.utils.z0:
-com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.utils.A0:
+com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.utils.A0:
+com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.utils.B0:
     char nextChar() -> a
-com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.utils.B0:
-com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.utils.C0:
+com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.utils.C0:
+com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.utils.D0:
     1:1:void <init>():9:9 -> <init>
     boolean hasNext() -> a
     1:2:void forEachRemaining(java.util.function.IntConsumer):12:13 -> a
     3:6:int nextIntComputeIfAbsent(com.android.tools.r8.utils.ThrowingIntSupplier):22:25 -> a
     int nextInt() -> b
-com.android.tools.r8.utils.ThrowingIntSupplier -> com.android.tools.r8.utils.D0:
+com.android.tools.r8.utils.ThrowingIntSupplier -> com.android.tools.r8.utils.E0:
     int getAsInt() -> a
-com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.utils.E0:
+com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.utils.F0:
     1:1:void <init>():11:11 -> <init>
     boolean hasNext() -> a
     1:4:java.lang.Object computeNextIfAbsent(com.android.tools.r8.utils.ThrowingSupplier):18:21 -> a
     5:10:java.util.List take(int):25:30 -> a
     11:11:java.util.List take(int):28:28 -> a
     java.lang.Object next() -> b
-com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.utils.F0:
-com.android.tools.r8.utils.Timing -> com.android.tools.r8.utils.G0:
+com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.utils.G0:
+com.android.tools.r8.utils.Timing -> com.android.tools.r8.utils.H0:
     java.util.Stack stack -> a
     boolean trackMemory -> b
     1:1:void <init>():27:27 -> <init>
@@ -55622,10 +55974,10 @@
     12:12:java.util.Map access$100(com.android.tools.r8.utils.Timing):21 -> b
     13:13:java.util.Map computeMemoryInformation():211:211 -> b
     13:13:java.util.Map access$100(com.android.tools.r8.utils.Timing):21 -> b
-com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.utils.G0$a:
+com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.utils.H0$a:
     long used -> a
     1:2:void <init>(long):43:44 -> <init>
-com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.utils.G0$b:
+com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.utils.H0$b:
     com.android.tools.r8.utils.Timing this$0 -> g
     java.util.Map children -> b
     java.lang.String title -> a
@@ -55672,9 +56024,9 @@
     3:3:java.lang.String com.android.tools.r8.utils.Timing.access$200(long):21 -> toString
     3:3:java.lang.String toString():96 -> toString
     4:4:java.lang.String toString():96:96 -> toString
-com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.utils.H0:
+com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.utils.I0:
     java.lang.Object apply(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.utils.I0:
+com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.utils.J0:
     com.android.tools.r8.utils.VersionProperties INSTANCE -> c
     java.lang.String sha -> a
     java.lang.String releaser -> b
@@ -55692,7 +56044,7 @@
     1:1:java.lang.String getSha():57 -> b
     2:2:java.lang.String getSha():57:57 -> b
     1:1:java.lang.String toString():62:62 -> toString
-com.android.tools.r8.utils.ZipUtils -> com.android.tools.r8.utils.J0:
+com.android.tools.r8.utils.ZipUtils -> com.android.tools.r8.utils.K0:
     boolean lambda$unzip$0(java.util.zip.ZipEntry) -> a
     1:1:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):44:44 -> a
     2:2:java.util.List unzip(java.lang.String,java.io.File):48:48 -> a
@@ -55713,5 +56065,5 @@
     47:59:void writeToZipStream(java.util.zip.ZipOutputStream,java.lang.String,com.android.tools.r8.ByteDataView,int):83:95 -> a
     60:67:boolean isClassFile(java.lang.String):104:111 -> a
     1:2:boolean isDexFile(java.lang.String):99:100 -> b
-com.android.tools.r8.utils.ZipUtils$OnEntryHandler -> com.android.tools.r8.utils.J0$a:
+com.android.tools.r8.utils.ZipUtils$OnEntryHandler -> com.android.tools.r8.utils.K0$a:
     void onEntry(java.util.zip.ZipEntry,java.io.InputStream) -> a